new 1.2.4 API update
fix CPHALCON_DIR
fix CPHALCON_DIR
Merge branch 'master' into 1.2.3
Merge branch 'master' into 1.2.4
Merge branch 'master' into 1.2.3
Merge branch 'master' into 1.2.4
update api version
Merge branch 'master' into 1.2.3
Merge branch '1.2.3' into 1.2.4
Merge branch 'master' into 1.2.3
Merge branch '1.2.3' into 1.2.4
Merge branch 'master' into 1.2.4
1.2.4 API update
1.2.4 API update for russian
Update di.rst
Update di.rst
Translated section "Implementing your own DI" and correcting grammatical errors.
Merge pull request #198 from JimmDiGrizli/patch-1

Translated section "Implementing your own DI"
Just some spelling and grammar fixes.