Merge remote-tracking branch 'chiiph/feature/cacert_osx' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Thu, 10 Jul 2014 14:44:49 +0000 (11:44 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Thu, 10 Jul 2014 14:44:49 +0000 (11:44 -0300)

Trivial merge