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)
commit90cd60a3c73796372b11b90f0b23ec91c944bfc1
tree85c479f4efc1f3a8e80eb60bf30e9174ce071308
parent279fa11b6f49aabc2269dbd2316e2186d1373cbe
parent60b51222f5aab24e8aab1b9f763c2d63eb29bc89
Merge remote-tracking branch 'chiiph/feature/cacert_osx' into develop