Merge remote-tracking branch 'kali/add-readme-to-manifest' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 8 Nov 2013 11:07:43 +0000 (08:07 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 8 Nov 2013 11:07:43 +0000 (08:07 -0300)
commit29e6a3367f537b6b09e43731a4d930293a3b1372
treea7b92d784ca858cd53bde8d11251d0f26dee8005
parent5be557db1e5eff7fec71e1c65b0cbb4cb54c2ba6
parent754f89f920fb78953d60737e1296ef4dea4bd6d3
Merge remote-tracking branch 'kali/add-readme-to-manifest' into develop