[xfce4-battery-plugin/f22: 2/2] Merge branch 'master' into f22

[Peter Robinson]

commit 43b8a286575c7817deab9f24e160ab9e35ea607b
Merge: 2a8d3e7 72491eb
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 24 14:10:02 2015 +0000

    Merge branch 'master' into f22

---