merge mozilla-inbound to mozilla-central a=merge
commitc544f0d43095324dee33a8f02acea4497c57a232
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 10:54:07 +0000 (2 11:54 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 10:54:07 +0000 (2 11:54 +0100)
tree3380d659e24b4e072bb9ef351716daff6d65da22
parent60c18dcb287b735b40461937702f6c2eada36623
parente968844794b6f0094744adc0233328c53985c434
merge mozilla-inbound to mozilla-central a=merge