Merge remote-tracking branch 'kali/fix-typo' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 10 Dec 2013 21:14:53 +0000 (18:14 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 10 Dec 2013 21:14:53 +0000 (18:14 -0300)

Trivial merge