From 932bf0053275c36f10960f5c3ce08ff152d1d529 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Sun, 1 Sep 2013 19:26:13 +0200
Subject: [PATCH] update propel version and dependencies

---
 composer.json |  4 ++--
 composer.lock | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 67fb90100..8b137845d 100755
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "php": ">=5.4",
         "ezyang/htmlpurifier": "dev-master",
         "ircmaxell/password-compat": "dev-master",
-        "propel/propel": "2.0.0-alpha1",
+        "propel/propel": "dev-master",
         "psr/log" : "1.0",
         "symfony/class-loader": "2.2.*",
         "symfony/config" : "2.2.*",
@@ -27,7 +27,7 @@
         "symfony-cmf/routing": "1.0.0",
 
         "symfony/form": "2.2.*",
-        "symfony/validator": "2.3.*@dev",
+        "symfony/validator": "2.3.*",
 
         "smarty/smarty": "v3.1.14",
         "kriswallsmith/assetic": "1.2.*@dev",
diff --git a/composer.lock b/composer.lock
index 731d38164..9af980224 100755
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "458aeccc06b7394d7653a9063b6fd981",
+    "hash": "050e3da6bd52d5743a46e09992cf67c0",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -254,16 +254,16 @@
         },
         {
             "name": "propel/propel",
-            "version": "2.0.0-alpha1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/propelorm/Propel2.git",
-                "reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184"
+                "reference": "58a25ded43c3d04313cad2b738342d307988b1b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184",
-                "reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184",
+                "url": "https://api.github.com/repos/propelorm/Propel2/zipball/58a25ded43c3d04313cad2b738342d307988b1b5",
+                "reference": "58a25ded43c3d04313cad2b738342d307988b1b5",
                 "shasum": ""
             },
             "require": {
@@ -310,7 +310,7 @@
                 "orm",
                 "persistence"
             ],
-            "time": "2013-06-05 06:46:14"
+            "time": "2013-09-01 13:29:51"
         },
         {
             "name": "psr/log",
@@ -1066,22 +1066,23 @@
         },
         {
             "name": "symfony/icu",
-            "version": "v1.0.0",
+            "version": "v1.2.0",
             "target-dir": "Symfony/Component/Icu",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Icu.git",
-                "reference": "v1.0.0"
+                "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.0.0",
-                "reference": "v1.0.0",
+                "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
+                "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
                 "shasum": ""
             },
             "require": {
+                "lib-icu": ">=4.4",
                 "php": ">=5.3.3",
-                "symfony/intl": ">=2.3,<3.0"
+                "symfony/intl": "~2.3"
             },
             "type": "library",
             "autoload": {
@@ -1109,7 +1110,7 @@
                 "icu",
                 "intl"
             ],
-            "time": "2013-06-03 18:32:07"
+            "time": "2013-06-03 18:32:58"
         },
         {
             "name": "symfony/intl",
@@ -1508,7 +1509,7 @@
         },
         {
             "name": "symfony/validator",
-            "version": "2.3.x-dev",
+            "version": "v2.3.4",
             "target-dir": "Symfony/Component/Validator",
             "source": {
                 "type": "git",
@@ -2037,8 +2038,7 @@
     "stability-flags": {
         "ezyang/htmlpurifier": 20,
         "ircmaxell/password-compat": 20,
-        "propel/propel": 15,
-        "symfony/validator": 20,
+        "propel/propel": 20,
         "kriswallsmith/assetic": 20,
         "leafo/lessphp": 20,
         "ptachoire/cssembed": 20,