commit b28dc574f3ca7fdb3c46bffcbc094f8184e97cd0
author Andrew Grieve <agrieve@chromium.org> Fri Sep 06 00:16:47 2013 -0400
committer Andrew Grieve <agrieve@chromium.org> Fri Sep 06 00:16:47 2013 -0400
tree ac61ba376e5ce37b7b408254421000919f4a6bfd
parent 240d440c5f4189b98ea376d02a45cc981734482e
parent 7568d53bac1141591c785645d4e38de485254aa7

Merge branch 'dev'

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..810e68a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+# Release Notes
+
+### 0.2.1 (Sept 5, 2013)
+* [CB-4580] Fixed up duplicate definitions of module id
+* [CB-4432] Copyright notice change
+

plugin.xml

diff --git a/plugin.xml b/plugin.xml
index 062530d..67655c5 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,7 +4,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="org.apache.cordova.core.contacts"
-    version="0.2.0">
+    version="0.2.1">
 
     <name>Contacts</name>
     <description>Cordova Contacts Plugin</description>
@@ -73,11 +73,11 @@
             </feature>
         </config-file>
 
-        <js-module src="www/ios/contacts.js" name="contacts">
+        <js-module src="www/ios/contacts.js" name="contacts-ios">
             <merges target="navigator.contacts" />
         </js-module>
 
-        <js-module src="www/ios/Contact.js" name="Contact">
+        <js-module src="www/ios/Contact.js" name="Contact-iOS">
             <merges target="Contact" />
         </js-module>
 
@@ -85,7 +85,7 @@
         <source-file src="src/ios/CDVContacts.m" />
         <header-file src="src/ios/CDVContact.h" />
         <source-file src="src/ios/CDVContact.m" />
-        
+
         <framework src="AddressBook.framework" weak="true" />
         <framework src="AddressBookUI.framework" weak="true" />
         <framework src="CoreGraphics.framework" />