Merge remote-tracking branch 'kali/bug/renew-testing-certificates' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 3 Sep 2013 18:09:00 +0000 (15:09 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 3 Sep 2013 18:09:00 +0000 (15:09 -0300)

Trivial merge