Bundle log4moz.js, which is needed by Fx24 Sqlite.jsm and was removed from Fx
Merge remote-tracking branch 'upstream/master' into indexing