Merge pull request #17 from igorw/master

re-add swiftmailer autoloading code

app/autoload.php

@@ -39,3 +39,8 @@ AnnotationRegistry::registerLoader(function($class) use ($loader) {
     return class_exists($class, false);
 });
 AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
+
+// Swiftmailer needs a special autoloader to allow
+// the lazy loading of the init file (which is expensive)
+require_once __DIR__.'/../vendor/swiftmailer/lib/classes/Swift.php';
+Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/lib/swift_init.php');

deps

@@ -4,7 +4,7 @@
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.1.1
+    version=v1.1.2
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
@@ -61,3 +61,4 @@
 [FOSUserBundle]
     git=git://github.com/FriendsOfSymfony/FOSUserBundle.git
     target=/bundles/FOS/UserBundle
+    version=1.0.0

deps.lock

@@ -1,5 +1,5 @@
 symfony c3ebdbf9cceddb82cd2089aaef8c7b992e536363
-twig 94ac20f1553d945c2c224d19d9d28e85ec14372b
+twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
 monolog 433b98d4218c181bae01865901aac045585e8a1a
 doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500
 doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f
@@ -13,4 +13,4 @@ JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c
 SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870
 SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5
 AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10
-FOSUserBundle 7e6ac80a6bc23d3b1533abf8878d01f67cee44a7
+FOSUserBundle 67300def4b2628512197c1fe05cd25727c309e20