Merge remote-tracking branch 'kali/bug/assert_nonnull_soledad' into develop
authorTomás Touceda <chiiph@leap.se>
Mon, 2 Sep 2013 12:28:50 +0000 (09:28 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 2 Sep 2013 12:28:50 +0000 (09:28 -0300)

Trivial merge