Merge branch 'tizen' of https://github.com/gabrielschulhof/cordova-plugman
authorAnis Kadri <anis@apache.org>
Tue, 11 Feb 2014 22:45:04 +0000 (14:45 -0800)
committerAnis Kadri <anis@apache.org>
Tue, 11 Feb 2014 22:45:04 +0000 (14:45 -0800)
commit4eb4d2dc169840bdb55c13971f53acf8014ff6e8
tree06658b78b9bc9630f3a35aa3b8ca27504d954c5e
parentce8c421481ff04e87eaf81442e9504b6358c13c3
parent72c3d463ed67e3e81964a19cbc16d425b745d302
Merge branch 'tizen' of https://github.com/gabrielschulhof/cordova-plugman

Conflicts:
README.md
README.md
package.json