Merge remote-tracking branch 'kali/bug/more-compact-debug' into develop
authorTomás Touceda <chiiph@leap.se>
Thu, 23 May 2013 14:08:53 +0000 (11:08 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 23 May 2013 14:08:53 +0000 (11:08 -0300)

Trivial merge