Merge remote-tracking branch 'kali/add-manifest' into develop
authorTomás Touceda <chiiph@leap.se>
Mon, 26 Aug 2013 14:22:18 +0000 (11:22 -0300)
committerTomás Touceda <chiiph@leap.se>
Mon, 26 Aug 2013 14:22:18 +0000 (11:22 -0300)

Trivial merge