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