Artur Adib c49e9ec07a Merge remote-tracking branch 'mozilla/master' into issue1133
Conflicts:
	src/util.js
	test/test_manifest.json
2012-02-06 16:11:52 -08:00
..