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)

Trivial merge