Merge branch '1.2.2'

Conflicts: build/32bits/phalcon.c build/64bits/phalcon.c build/safe/phalcon.c
phalcon · Aug 6, 2013 · ee68cb5 · ee68cb5
2 parents 30a4478 + d6c3e08
commit ee68cb5
Show file tree

Hide file tree

Showing 20 changed files with 378,564 additions and 158,159 deletions.
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
diff --git a/build/32bits/php_phalcon.h b/build/32bits/php_phalcon.h
@@ -20,7 +20,7 @@
 #ifndef PHP_PHALCON_H
 #define PHP_PHALCON_H 1
 
-#define PHP_PHALCON_VERSION "1.2.1"
+#define PHP_PHALCON_VERSION "1.2.2"
 #define PHP_PHALCON_EXTNAME "phalcon"
 
 /** Memory frame */