[powerdevil/f22: 2/2] Merge branch 'master' into f22

[Daniel Vrátil]

commit 4c13d5dec604f53867cea101651efda35ba5864c
Merge: d6c39ec 03dda66
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Mar 23 18:40:40 2015 +0100

    Merge branch 'master' into f22

 .gitignore      | 1 +
 powerdevil.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---