Merge branch 'master' of github.com:apache/cordova-plugin-geolocation 8/head
authorPiotr Zalewa <piotr@zalewa.info>
Tue, 14 Jan 2014 11:41:53 +0000 (12:41 +0100)
committerPiotr Zalewa <piotr@zalewa.info>
Tue, 14 Jan 2014 11:41:53 +0000 (12:41 +0100)
commitcb3612c74c8d35d826d1f11182f8d9b2d2f5de17
tree17878428090444edd17a2b7048e55194013cceda
parent9e8ce3074e726a2f5315bac5ff848e331dfb5cfb
parent236ec15d237277d3e2be415a313eb915b8e5579e
Merge branch 'master' of github.com:apache/cordova-plugin-geolocation

Conflicts:
plugin.xml