tree 38840aa3ab3820659df595815da12c8421adedcf
parent 9a15a5a562cc60c090534457d312cc2a4513ce09
parent 1c8f9e65322555b936a13d95029ac112c1253db2
author Steven Gill <stevengill97@gmail.com> 1400025183 -0700
committer Steven Gill <stevengill97@gmail.com> 1400025183 -0700

Merge branch 'fix-default' of https://github.com/mozilla-cordova/cordova-firefoxos