tree dbbed874aded374be483d9c7ff3f4c992e660e9f
parent b2596302c82b50a6f77deef3f8a1bb54d87b8d39
parent d3dd1803aa7d8474aadbcb850ed0a572d23bb71a
author Jesse MacFadyen <purplecabbage@gmail.com> 1400022082 -0700
committer Jesse MacFadyen <purplecabbage@gmail.com> 1400022082 -0700

Merge branch 'CB-6684' of https://github.com/MSOpenTech/cordova-windows into 3.5.x