Merge remote-tracking branch 'kali/bump-also-sanity-check' into develop
authorTomás Touceda <chiiph@leap.se>
Wed, 9 Oct 2013 15:26:29 +0000 (12:26 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 9 Oct 2013 15:26:29 +0000 (12:26 -0300)

Trivial merge