Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova...
authortimkim <timkim@apche.org>
Thu, 17 May 2012 22:00:06 +0000 (15:00 -0700)
committertimkim <timkim@apche.org>
Thu, 17 May 2012 22:00:06 +0000 (15:00 -0700)
commit60f000fc2c82e7c33af81518239fa2435572643c
treef3ad708902fb8fc10ed4aa25785dab5ecb7fd40b
parent9515b1df7b81526e3b3dbe070178a26b9482b507
parent34b767dd2d11cde46d2e9b5e351c0093ab2afbdc
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-mobile-spec