tree 5badeccca470692f0a1f220a211409ce56a56542
parent 3ecb723b83113b2c664182aba526236fbc8bfd6c
parent 7800b1b2718ff5a27afd63e3a7a2f366fb673145
author Steven Gill <stevengill97@gmail.com> 1400025153 -0700
committer Steven Gill <stevengill97@gmail.com> 1400025153 -0700

Merge branch 'CB-5816' of https://github.com/Steckelfisch/cordova-firefoxos

Conflicts:
	package.json