Merge remote-tracking branch 'mozilla/fix-battery'
authorPiotr Zalewa <piotr@zalewa.info>
Tue, 20 May 2014 06:19:30 +0000 (08:19 +0200)
committerPiotr Zalewa <piotr@zalewa.info>
Tue, 20 May 2014 06:19:30 +0000 (08:19 +0200)
commit1b7ca6be546316b11680412aadd3a541e3a03a49
treede7060e84901b90028a921b2d447eb8025cdb02e
parentb0ef368c4c95ec7990e5d551185a8cdaf491bded
parent26b5b3f245828553e4a96983a61aa58b1ab39c60
Merge remote-tracking branch 'mozilla/fix-battery'