Revision 2393ba6d4f1b544349123e24a16bbc749bef9e55

Committed on 16/10/2012 9:18 pm by Fabien Potencier <fabien.potencier@gmail.com> [GitHub Diff]

Merge branch '2.0'

* 2.0:
Revert "merged branch elnur/stop-using-alias (PR #25)"