Merge branch 'plugman-registry' of 
https://git-wip-us.apache.org/repos/asf/cordova-plugman into plugman-registry

Conflicts:
        doc/help.txt
        main.js
        package.json
        plugin_spec.md
        plugman.js
        src/fetch.js


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/5a22d2a4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/5a22d2a4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/5a22d2a4

Branch: refs/heads/master
Commit: 5a22d2a43f61fa5a98022d79429fc950f8c393fd
Parents: 93acf39 c9a42d6
Author: Anis Kadri <[email protected]>
Authored: Thu Jul 11 14:49:46 2013 -0700
Committer: Anis Kadri <[email protected]>
Committed: Thu Jul 11 14:49:46 2013 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------


Reply via email to