fixing conflicts

Author: phalcon

.gitignore

@@ -411,3 +411,53 @@ build/64bits/modules/
 build/64bits/phalcon.la
 build/64bits/phalcon.lo
 build/64bits/run-tests.php
+build/safe/.deps
+build/safe/.libs/
+build/safe/Makefile
+build/safe/Makefile.fragments
+build/safe/Makefile.global
+build/safe/Makefile.objects
+build/safe/acinclude.m4
+build/safe/aclocal.m4
+build/safe/autom4te.cache/
+build/safe/build/
+build/safe/config.guess
+build/safe/config.h
+build/safe/config.h.in
+build/safe/config.log
+build/safe/config.nice
+build/safe/config.status
+build/safe/config.sub
+build/safe/configure
+build/safe/configure.in
+build/safe/install-sh
+build/safe/libtool
+build/safe/ltmain.sh
+build/safe/missing
+build/safe/mkinstalldirs
+build/safe/modules/
+build/safe/phalcon.la
+build/safe/phalcon.lo
+build/safe/run-tests.php
+ext/annotations/.libs/
+ext/annotations/adapter.lo
+ext/annotations/adapter/.libs/
+ext/annotations/adapter/memory.lo
+ext/annotations/annotation.lo
+ext/annotations/collection.lo
+ext/annotations/exception.lo
+ext/annotations/parser.lo
+ext/annotations/reader.lo
+ext/annotations/reflection.lo
+ext/annotations/scanner.lo
+ext/di/service/.libs/
+ext/di/service/builder.lo
+ext/mvc/collectioninterface.lo
+ext/mvc/micro/collection.lo
+ext/mvc/model/behavior/softdelete.lo
+ext/mvc/model/behaviorinterface.lo
+ext/mvc/model/metadata/strategy/.libs/
+ext/mvc/model/metadata/strategy/introspection.lo
+ext/mvc/model/relationinterface.lo
+ext/mvc/router/annotations.lo
+ext/mvc/router/group.lo

CHANGELOG

@@ -1,3 +1,27 @@
+0.9.0b2
+ - Support for reusable records. A relation can be marked to cache in memory the records to speedup getting related records
+ - Added 'elseif' statement to Volt
+ - Changed static key in Volt's 'cache' to any valid expression
+ - Added Phalcon\Logger\Adapter\Syslog and Phalcon\Logger\Adapter\Stream to Phalcon\Logger
+ - Added Phalcon\Logger\Multiple to send logs to multiples adapters
+ - Added formatters abstraction to Phalcon\Logger, now including: Phalcon\Logger\Formatter\Line, Phalcon\Logger\Formatter\Json and Phalcon\Logger\Formatter\Syslog
+ - Added Phalcon\Annotations\Adapter\Files to Phalcon\Annotations, this adapter stores the annotations in PHP files
+
+0.9.0b1
+ - Added Phalcon\Annotations, a general purpose component to read annotations from docblocks
+ - Phalcon\Mvc\Model now supports saving related records using magic methods with a unique call to 'save'
+ - Adding autoescaping option to Phalcon\Tag
+ - Added andWhere/orWhere to Phalcon\Mvc\Model\Criteria
+ - Added passing an HTTP body to the Phalcon\Http\Response's constructor
+ - Phalcon\Mvc\View is now able to pass variables to the views using magic methods
+ - Support for slice with filter and built-in syntax in Volt
+ - Added magic methods in the ORM to find/findFirst by a single field
+ - Improved XSS protection in Phalcon\Tag
+ - Implemented queuing events with priorities in Phalcon\Events
+ - Implemented collecting of returned responses in Phalcon\Events
+ - Added toArray method to Phalcon\Mvc\Model\Resultset classes
+ - Added hydration modes to Phalcon\Mvc\Model\Resultset (HYDRATE_RECORDS, HYDRATE_ARRAYS, HYDRATE_OBJECTS)
+
 0.8.0b1
  - Improved Phalcon\Escaper, this component provides contextual escaping of different kinds of texts (CSS, Javascript, URL, HTML Attributes etc)
  - Added serialization of Mvc\Collection instances

README.md

@@ -19,7 +19,7 @@ For use phalcon on windows you only should to download a DLL library
 
      extension=php_phalcon.dll
 
-Finally restart your webserver. 
+Finally restart your webserver.
 
 ### Linux/Unix/Mac
 
@@ -38,7 +38,7 @@ Ubuntu:
 
 Suse:
 
-    yast2 -i php5-pear php5-dev libmysqlclient gcc make autoconf2.13
+    yast2 -i php5-pear php5-devel libmysqlclient gcc make autoconf2.13
 
 Compilation
 -----------
@@ -48,7 +48,7 @@ Follow these instructions to generate a binary extension for your platform:
      # git clone git://github.com/phalcon/cphalcon.git
      # cd cphalcon/build
      # sudo ./install
- 
+
 Add extension to your php.ini
 
      extension=phalcon.so