Merge branch 'master' into ffos_privileged_compatible
authorPiotr Zalewa <piotr@zalewa.info>
Wed, 14 May 2014 13:42:17 +0000 (15:42 +0200)
committerPiotr Zalewa <piotr@zalewa.info>
Wed, 14 May 2014 13:42:17 +0000 (15:42 +0200)
commit53a34221c2c78ccfb742e8e793225bec195be0ff
tree8596dc0d4fd6bd4dfe307c1b43d4867d3d38eb0e
parenta7c88d8fc6999996179356db7759db82782fee4e
parent508f29f4c0a7602630bdc788da03b96b27f6b904
Merge branch 'master' into ffos_privileged_compatible
cordova-incl.js