Merge remote-tracking branch 'kali/hotfix/add_manifest' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 17:56:02 +0000 (14:56 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 17:56:02 +0000 (14:56 -0300)
commit5ef6f1ae070ed7e5236aab119d7785f70e54b8e3
tree4227d6bec94a442704755ea663a985406b4dc52f
parentda1b6ca41afca38a1e44315c8f0c1b4496e272f4
parentf1f92bd97cf71db417b7b801b4bfe7e3df11e554
Merge remote-tracking branch 'kali/hotfix/add_manifest' into develop