Merge remote-tracking branch 'kali/bug/fix-exception' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 3 Sep 2013 14:59:02 +0000 (11:59 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Tue, 3 Sep 2013 14:59:02 +0000 (11:59 -0300)

Trivial merge