tree 6d459b61184160b3f494c8b65d0f740d7b67fc80
parent 5709735ecddf20e19a88a9a856c4ab393e73e1f5
parent 554df353db8c184103e5422b8d5466470ef33b70
author Steven Gill <stevengill97@gmail.com> 1400178796 -0700
committer Steven Gill <stevengill97@gmail.com> 1400178796 -0700

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