Merged 'development'.
authorjuan Ignacio Borda <juanignacioborda@gmail.com>
Tue, 22 Apr 2014 18:27:09 +0000 (15:27 -0300)
committerjuan Ignacio Borda <juanignacioborda@gmail.com>
Tue, 22 Apr 2014 18:27:09 +0000 (15:27 -0300)
commit9a0977646d8c5d38d0064680b035073e8784b815
tree86510e19c8b2ac754b2a82fb2a7f9224f9b478eb
parentef8d47b7cbc64c099f1e67dfdcb39932b827ed16
Merged 'development'.

Conflicts:
.gitignore
.gitignore
application/libraries/fake/fake_controller.php [new file with mode: 0644]
application/libraries/fake/fake_functions.php [new file with mode: 0644]
application/modules/bpm/models/bpm.php