Merge remote-tracking branch 'meskio/feature/cleanup_api' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 7 Oct 2014 19:08:50 +0000 (16:08 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 7 Oct 2014 19:08:50 +0000 (16:08 -0300)

Trivial merge