merge b2g-inbound to mozilla-central a=merge
commit9f140ae3ceca706e536bb6569dcee210c17257b4
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 18 Jun 2014 12:38:13 +0000 (18 14:38 +0200)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 18 Jun 2014 12:38:13 +0000 (18 14:38 +0200)
treeafeecd8cb1ec2e23d116fe17dd7e0e6f4e87856e
parent062ded1885e99c9663e4eab4dd0a658daa97055e
parentdb12c9ea16e8f57e4e21f60e3e04a8e6588bfbc6
merge b2g-inbound to mozilla-central a=merge