[drumkv1/f21: 2/2] Merge branch 'master' into f21

[Brendan Jones]

commit 39e393cf53f24df1cc1485d483a8d54954061114
Merge: ff3bb1b 97b2033
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sun Mar 22 11:23:13 2015 +0100

    Merge branch 'master' into f21

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