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)

Trivial merge