Merge remote-tracking branch 'kali/hotfix/add-to-manifest' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 18:39:16 +0000 (15:39 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 27 Aug 2013 18:39:16 +0000 (15:39 -0300)
commit518169758b3aec1beef1ae15bf08cb4906517f49
tree53b7da43b130a1d595b9d8d68b35d552d3ce4e33
parentc8289325b28422903e08f971715550b89e41e3d4
parent3762233c7e48b2432e1faffc15603c427d18640f
Merge remote-tracking branch 'kali/hotfix/add-to-manifest' into develop