Bug 1040931 - Add extensionID parameter to addEngineWithDetails r=gavin
Bug 1032129 - Render AudioParam connections in web audio editor. r=vp
Backed out changeset 836c52cc3c05 (bug 1040931)
Merge mozilla-central and fx-team
Bug 1024686 - Add missing return in Sqlite.jsm. r=mak
Bug 1054916: Apply trimage to Fennec's PNGs r=lucasr
Bug 1055570 - Update pdf.js to version 1.0.712. r=yury
Bug 1048230 - Global indicator inaccessible when taskbar is on top of the screen, r=Enn.
Bug 1047340 fix annotation of marks by using the browser url rather than cannonical url, r=jaws
Merge fx-team to m-c. a=merge