chmod (de merde)

composer.lock

@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
-    "hash": "8fa2363ec51be0f17ab9adab0dcf22d0",
-=======
-    "hash": "8c20901e9c7b4d5355afa461450af0ae",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+    "hash": "de4530fc22c2b2f2da7b60c62cbf96f6",
     "packages": [
         {
             "name": "cedriclombardot/admingenerator-generator-bundle",
@@ -12,21 +8,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
-<<<<<<< HEAD
-                "reference": "dbcbd469aec90551e48730075f310d9bf6d92cb6"
+                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/dbcbd469aec90551e48730075f310d9bf6d92cb6",
-                "reference": "dbcbd469aec90551e48730075f310d9bf6d92cb6",
-=======
-                "reference": "b46f56fbdb24c74bf296cef1e0e8f8fbbb504cb1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/b46f56fbdb24c74bf296cef1e0e8f8fbbb504cb1",
-                "reference": "b46f56fbdb24c74bf296cef1e0e8f8fbbb504cb1",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/848a74cd26bda2988f52d9168ddffccb91a87f33",
+                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33",
                 "shasum": ""
             },
             "require": {
@@ -45,11 +32,7 @@
             "suggest": {
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
             },
-<<<<<<< HEAD
-            "time": "2013-03-26 07:49:40",
-=======
-            "time": "2013-03-10 18:15:34",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-04-04 23:29:16",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -241,7 +224,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jonathan H. Wage",
+                    "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com",
                     "homepage": "http://www.jwage.com/"
                 }
@@ -254,7 +237,6 @@
         },
         {
             "name": "doctrine/dbal",
-<<<<<<< HEAD
             "version": "2.3.3",
             "source": {
                 "type": "git",
@@ -265,29 +247,13 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.3",
                 "reference": "2.3.3",
-=======
-            "version": "2.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/dbal",
-                "reference": "2.3.2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/dbal/archive/2.3.2.zip",
-                "reference": "2.3.2",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
                 "doctrine/common": ">=2.3.0,<2.5-dev",
                 "php": ">=5.3.2"
             },
-<<<<<<< HEAD
             "time": "2013-03-24 19:16:29",
-=======
-            "time": "2013-01-07 20:03:43",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -461,7 +427,6 @@
         },
         {
             "name": "doctrine/orm",
-<<<<<<< HEAD
             "version": "2.3.3",
             "source": {
                 "type": "git",
@@ -472,18 +437,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.3",
                 "reference": "2.3.3",
-=======
-            "version": "2.3.2",
-            "source": {
-                "type": "git",
-                "url": "git://github.com/doctrine/doctrine2.git",
-                "reference": "2.3.2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/doctrine2/archive/2.3.2.zip",
-                "reference": "2.3.2",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -495,11 +448,7 @@
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
-<<<<<<< HEAD
             "time": "2013-03-24 20:43:58",
-=======
-            "time": "2013-01-07 20:05:04",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "bin": [
                 "bin/doctrine",
                 "bin/doctrine.php"
@@ -1155,21 +1104,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kriswallsmith/assetic.git",
-<<<<<<< HEAD
-                "reference": "50a24301b40cd7df29a7da4efd5573a9ef4622f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/50a24301b40cd7df29a7da4efd5573a9ef4622f8",
-                "reference": "50a24301b40cd7df29a7da4efd5573a9ef4622f8",
-=======
-                "reference": "fcee205a5a3a859c009d976ba3acfe67958e912c"
+                "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/fcee205a5a3a859c009d976ba3acfe67958e912c",
-                "reference": "fcee205a5a3a859c009d976ba3acfe67958e912c",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/0a55a9ba70bd9250899ad77deceaf8cb9e145371",
+                "reference": "0a55a9ba70bd9250899ad77deceaf8cb9e145371",
                 "shasum": ""
             },
             "require": {
@@ -1195,11 +1135,7 @@
                 "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
                 "twig/twig": "Assetic provides the integration with the Twig templating engine"
             },
-<<<<<<< HEAD
-            "time": "2013-03-25 20:14:55",
-=======
-            "time": "2013-03-05 17:56:54",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-04-02 21:36:28",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1295,21 +1231,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
-<<<<<<< HEAD
-                "reference": "ae0ff215b3be2c3bd0b131a8b8daa9b15568c6db"
+                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/ae0ff215b3be2c3bd0b131a8b8daa9b15568c6db",
-                "reference": "ae0ff215b3be2c3bd0b131a8b8daa9b15568c6db",
-=======
-                "reference": "878aee5e274ca75fbdf74262efd05d1207c31669"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/878aee5e274ca75fbdf74262efd05d1207c31669",
-                "reference": "878aee5e274ca75fbdf74262efd05d1207c31669",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/4fded9adde16a4133b4db9f14815efadbbd268d1",
+                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1",
                 "shasum": ""
             },
             "require": {
@@ -1320,18 +1247,7 @@
                 "doctrine/orm": "2.*",
                 "mandango/mandango": "*",
                 "propel/propel1": ">=1.6,<2.0",
-                "solarium/solarium": "3.*"
-<<<<<<< HEAD
-            },
-            "suggest": {
-                "doctrine/mongodb-odm": "To use the DoctrineODMMongoDBAdapter.",
-                "doctrine/orm": "To use the DoctrineORMAdapter.",
-                "mandango/mandango": "To use the MandangoAdapter.",
-                "propel/propel1": "To use the PropelAdapter",
-                "solarium/solarium": "To use the SolariumAdapter."
-            },
-            "time": "2013-03-12 22:52:44",
-=======
+                "solarium/solarium": "dev-develop"
             },
             "suggest": {
                 "doctrine/mongodb-odm": "To use the DoctrineODMMongoDBAdapter.",
@@ -1340,8 +1256,7 @@
                 "propel/propel1": "To use the PropelAdapter",
                 "solarium/solarium": "To use the SolariumAdapter."
             },
-            "time": "2013-02-19 13:51:25",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-04-04 17:07:12",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1372,30 +1287,17 @@
         },
         {
             "name": "sensio/distribution-bundle",
-<<<<<<< HEAD
             "version": "v2.1.9",
-=======
-            "version": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "target-dir": "Sensio/Bundle/DistributionBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioDistributionBundle.git",
-<<<<<<< HEAD
                 "reference": "v2.1.9"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.9",
                 "reference": "v2.1.9",
-=======
-                "reference": "v2.1.8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioDistributionBundle/zipball/v2.1.8",
-                "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -1431,30 +1333,17 @@
         },
         {
             "name": "sensio/framework-extra-bundle",
-<<<<<<< HEAD
             "version": "v2.1.9",
-=======
-            "version": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "target-dir": "Sensio/Bundle/FrameworkExtraBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioFrameworkExtraBundle.git",
-<<<<<<< HEAD
                 "reference": "v2.1.9"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.9",
                 "reference": "v2.1.9",
-=======
-                "reference": "v2.1.8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioFrameworkExtraBundle/zipball/v2.1.8",
-                "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -1491,30 +1380,17 @@
         },
         {
             "name": "sensio/generator-bundle",
-<<<<<<< HEAD
             "version": "v2.1.9",
-=======
-            "version": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "target-dir": "Sensio/Bundle/GeneratorBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensio/SensioGeneratorBundle.git",
-<<<<<<< HEAD
                 "reference": "v2.1.9"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.9",
                 "reference": "v2.1.9",
-=======
-                "reference": "v2.1.8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensio/SensioGeneratorBundle/zipball/v2.1.8",
-                "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -1557,21 +1433,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/shtumi/ShtumiUsefulBundle.git",
-<<<<<<< HEAD
-                "reference": "368fb9003ff46c2204ebe5336d11f1e90853034a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/shtumi/ShtumiUsefulBundle/zipball/368fb9003ff46c2204ebe5336d11f1e90853034a",
-                "reference": "368fb9003ff46c2204ebe5336d11f1e90853034a",
-=======
-                "reference": "16b1d259f352eb5f31037352904e525b1852791a"
+                "reference": "fc6cef6a071d903749dfcff38884f9c240f9e6cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/shtumi/ShtumiUsefulBundle/zipball/16b1d259f352eb5f31037352904e525b1852791a",
-                "reference": "16b1d259f352eb5f31037352904e525b1852791a",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/shtumi/ShtumiUsefulBundle/zipball/fc6cef6a071d903749dfcff38884f9c240f9e6cf",
+                "reference": "fc6cef6a071d903749dfcff38884f9c240f9e6cf",
                 "shasum": ""
             },
             "require": {
@@ -1581,11 +1448,7 @@
                 "sonata-project/admin-bundle": "master-dev",
                 "sonata-project/doctrine-orm-admin-bundle": "master-dev"
             },
-<<<<<<< HEAD
-            "time": "2013-03-25 12:10:45",
-=======
-            "time": "2013-03-06 17:06:49",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-04-08 08:10:20",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -1617,21 +1480,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-<<<<<<< HEAD
-                "reference": "25ce399e05dbf8685111003780aecbcc2ef968cc"
+                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/25ce399e05dbf8685111003780aecbcc2ef968cc",
-                "reference": "25ce399e05dbf8685111003780aecbcc2ef968cc",
-=======
-                "reference": "8b4266b2c8b6e66101a1a585f9e7a398213a7c78"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/8b4266b2c8b6e66101a1a585f9e7a398213a7c78",
-                "reference": "8b4266b2c8b6e66101a1a585f9e7a398213a7c78",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/839771a96dfcabf22d434e5dc6722b3bc88a6320",
+                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320",
                 "shasum": ""
             },
             "require": {
@@ -1658,11 +1512,7 @@
                 "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
                 "sonata-project/intl-bundle": "2.1.*"
             },
-<<<<<<< HEAD
-            "time": "2013-03-27 16:46:49",
-=======
-            "time": "2013-03-10 13:51:33",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-04-05 09:00:56",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1706,12 +1556,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataBlockBundle.git",
-                "reference": "0ed67b750065468036f2e8cd9ea7da59b4653cbc"
+                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/0ed67b750065468036f2e8cd9ea7da59b4653cbc",
-                "reference": "0ed67b750065468036f2e8cd9ea7da59b4653cbc",
+                "url": "https://api.github.com/repos/sonata-project/SonataBlockBundle/zipball/3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
+                "reference": "3f18e2df3171bb1149f55ffcb34ecc41169bf15f",
                 "shasum": ""
             },
             "require": {
@@ -1726,7 +1576,7 @@
                 "sonata-project/admin-bundle": "2.1.*@dev",
                 "sonata-project/cache-bundle": "2.1.*"
             },
-            "time": "2013-03-01 12:04:56",
+            "time": "2013-04-03 10:41:33",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -1821,7 +1671,6 @@
         },
         {
             "name": "sonata-project/exporter",
-<<<<<<< HEAD
             "version": "1.2.1",
             "source": {
                 "type": "git",
@@ -1832,18 +1681,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.1",
                 "reference": "1.2.1",
-=======
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sonata-project/exporter.git",
-                "reference": "1.2.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/exporter/zipball/1.2.0",
-                "reference": "1.2.0",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -1857,11 +1694,7 @@
                 "ext-curl": "*",
                 "symfony/routing": "*"
             },
-<<<<<<< HEAD
             "time": "2013-03-04 14:20:46",
-=======
-            "time": "2013-02-22 11:58:00",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -1944,24 +1777,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
-                "reference": "18957db1734b2fb6a391e77a3be75b9d8e2008fb"
+                "reference": "62b1dd67fadb6fdd72d6606cafa6260c18896b61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/18957db1734b2fb6a391e77a3be75b9d8e2008fb",
-                "reference": "18957db1734b2fb6a391e77a3be75b9d8e2008fb",
+                "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/62b1dd67fadb6fdd72d6606cafa6260c18896b61",
+                "reference": "62b1dd67fadb6fdd72d6606cafa6260c18896b61",
                 "shasum": ""
             },
             "require": {
                 "gedmo/doctrine-extensions": "2.3.*",
                 "php": ">=5.3.2",
-                "symfony/framework-bundle": ">=2.1,<2.3-dev"
+                "symfony/framework-bundle": ">=2.1,<3.0"
             },
             "suggest": {
-                "doctrine/doctrine-bundle": "*",
-                "doctrine/mongodb-odm-bundle": "2.1.*"
+                "doctrine/doctrine-bundle": "to use the ORM extensions",
+                "doctrine/mongodb-odm-bundle": "to use the MongoDB ODM extensions"
             },
-            "time": "2013-02-26 02:07:55",
+            "time": "2013-04-07 18:16:23",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -2113,30 +1946,17 @@
         },
         {
             "name": "symfony/monolog-bundle",
-<<<<<<< HEAD
             "version": "v2.1.9",
-=======
-            "version": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "target-dir": "Symfony/Bundle/MonologBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/MonologBundle.git",
-<<<<<<< HEAD
                 "reference": "v2.1.9"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.1.9",
                 "reference": "v2.1.9",
-=======
-                "reference": "v2.1.8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.1.8",
-                "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -2185,30 +2005,17 @@
         },
         {
             "name": "symfony/swiftmailer-bundle",
-<<<<<<< HEAD
             "version": "v2.1.9",
-=======
-            "version": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "target-dir": "Symfony/Bundle/SwiftmailerBundle",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/SwiftmailerBundle.git",
-<<<<<<< HEAD
                 "reference": "v2.1.9"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.9",
                 "reference": "v2.1.9",
-=======
-                "reference": "v2.1.8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/SwiftmailerBundle/zipball/v2.1.8",
-                "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -2253,18 +2060,6 @@
         },
         {
             "name": "symfony/symfony",
-<<<<<<< HEAD
-            "version": "v2.1.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/symfony.git",
-                "reference": "v2.1.9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/v2.1.9",
-                "reference": "v2.1.9",
-=======
             "version": "v2.1.8",
             "source": {
                 "type": "git",
@@ -2275,7 +2070,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/symfony/zipball/v2.1.8",
                 "reference": "v2.1.8",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
                 "shasum": ""
             },
             "require": {
@@ -2324,11 +2118,7 @@
                 "monolog/monolog": ">=1.0,<1.3-dev",
                 "propel/propel1": "dev-master"
             },
-<<<<<<< HEAD
-            "time": "2013-03-26 10:44:36",
-=======
             "time": "2013-02-23 21:28:36",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -2405,22 +2195,22 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.12.2",
+            "version": "v1.12.3",
             "source": {
                 "type": "git",
-                "url": "git://github.com/fabpot/Twig.git",
-                "reference": "v1.12.2"
+                "url": "https://github.com/fabpot/Twig.git",
+                "reference": "v1.12.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.2",
-                "reference": "v1.12.2",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
+                "reference": "v1.12.3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2013-02-09 18:21:53",
+            "time": "2013-04-08 12:40:11",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -2459,32 +2249,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git",
-<<<<<<< HEAD
-                "reference": "9cce71a2cfffa4e3d08a41b6ddd31ef0249a0aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/9cce71a2cfffa4e3d08a41b6ddd31ef0249a0aea",
-                "reference": "9cce71a2cfffa4e3d08a41b6ddd31ef0249a0aea",
-=======
-                "reference": "f664b66bc9351c6dd24026b3cf4c897705e51b26"
+                "reference": "5d1b9eb262055019a280a0ec48bc0b11fba5bb23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/f664b66bc9351c6dd24026b3cf4c897705e51b26",
-                "reference": "f664b66bc9351c6dd24026b3cf4c897705e51b26",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/5d1b9eb262055019a280a0ec48bc0b11fba5bb23",
+                "reference": "5d1b9eb262055019a280a0ec48bc0b11fba5bb23",
                 "shasum": ""
             },
             "require": {
                 "pagerfanta/pagerfanta": "1.0.*",
                 "symfony/framework-bundle": ">=2.1,<3.0"
             },
-<<<<<<< HEAD
-            "time": "2013-03-14 08:58:21",
-=======
-            "time": "2013-02-18 10:43:20",
->>>>>>> 86d451de31d12560b4aa04cb40581c4ea4f05536
+            "time": "2013-03-30 22:08:55",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {

web/bundles/admingeneratorgenerator/js/bootstrap/bootstrap-typeahead-extended.js

@@ -37,6 +37,7 @@
     this.updater = this.options.updater || this.updater
     this.getter = this.options.getter || this.getter
     this.setter = this.options.setter || this.setter
+    this.blur = this.options.blur || this.blur
     this.$menu = $(this.options.menu).appendTo('body')
     this.source = this.options.source
     this.shown = false
@@ -315,4 +316,4 @@
     })
   })
 
-}(window.jQuery);
+}(window.jQuery);