Merge remote-tracking branch 'kali/feature/more_debug_info' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 2 Aug 2013 13:34:46 +0000 (10:34 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 2 Aug 2013 13:34:46 +0000 (10:34 -0300)

Trivial merge