Joe Bowser d5d95ad489 Merging changes

2011-11-04 13:46:44 -07:00

..

phonegap.xml

forgot to resolve conflict

2011-10-14 15:49:16 -07:00

plugins.xml

Merging changes

2011-11-04 13:46:44 -07:00