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)
commit4d686e9f34bbbccdc5a57cccf9028b6106013d04
treeeabf3cf0a13e3321286e75524253f269f8021b3c
parentf12cbd95cb922c37cd9f7d00ca8a1c500a13a298
parentae720dcb38c767aa150b7cc792139ead88ea8ecc
Merge remote-tracking branch 'kali/fix-typo' into develop