Merge remote-tracking branch 'kali/hotfix/add-to-manifest'
authorTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 18:39:30 +0000 (15:39 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 18:39:30 +0000 (15:39 -0300)
commit3a21155bf3fb4990ce5a731680c8729a86cbbe3b
tree266026b956f4bdb0bac57a6c41908ebdabf9bda5
parent40c0f248758bf57b97af48be2b1f65818647f519
parent3762233c7e48b2432e1faffc15603c427d18640f
Merge remote-tracking branch 'kali/hotfix/add-to-manifest'