tree cdcc3c0d75f38b61d5b9e86bcb251aaddb9f0c7b
parent 7c2574da5e0054868290652bed53694e1a87eb36
parent 0de514b4b10b6c8c7bf99f0c50c490751eaedbf3
author Steve Gill <stevengill97@gmail.com> 1446248314 -0700
committer Steve Gill <stevengill97@gmail.com> 1446248314 -0700

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