tree eb75d1236dba82b427b3eb2cfa24994a53a49002
parent ee650b02db7f0f511e074e074c3dc81367025d28
parent 6b34cf410dc80019605f0b718bdf04aafff1401d
author Piotr Zalewa <piotr@zalewa.info> 1403871882 +0200
committer Piotr Zalewa <piotr@zalewa.info> 1403871882 +0200

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-firefoxos