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)
commitd74830c0268a98f44927bac8ba53e93852226cd9
tree575e146ba3710feb9c3489227fc613d836b46daf
parentcd5e297c2abdb082c10161f256c286b8216de883
parent701632bfd4fcb2c2d0e3231ad8dd5f188333df13
Merge remote-tracking branch 'kali/bug/assert_nonnull_soledad' into develop