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)
commitd367db764444c0befce425189acdf06339d1c566
treeb0acf685b74a784565799851b0b18dd86d13faf2
parent03e5e612103bf129602032065cfe5917b8de8be5
parent2c2f1eb7714bf98059b6966e08d01897c5626bd4
Merge remote-tracking branch 'kali/bug/fix-exception' into develop