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)
commitc8289325b28422903e08f971715550b89e41e3d4
treeb519d9f091ee72f3f2afe490d8511b8826fa2f62
parent4a124f94730775b97afc49b48ccfa0206459190f
parent8b7b19532be7fbb9211bf2179debbab6cef19510
Merge remote-tracking branch 'kali/add-manifest' into develop