Merge branch 'master' into browserify
authorAnis Kadri <anis@apache.org>
Thu, 24 Apr 2014 21:13:08 +0000 (14:13 -0700)
committerAnis Kadri <anis@apache.org>
Thu, 24 Apr 2014 21:13:08 +0000 (14:13 -0700)
commit013adc61c852561810994d899692d63b65176c6c
tree99208f50644d6ddfb8d4c36db38437e79f0ec624
parent93c65780a96818b21346d210c7d74bd28f66f94e
parent8aca4cb5b1a8012aa23ba05386d10cb59b3b4817
Merge branch 'master' into browserify
src/platforms/ios.js
src/prepare.js