[yoshimi/f21: 10/10] Merge branch 'master' into f21

[verdurin]

commit 5a1577b0927dc4b66e578bba3d40e49a11c7017b
Merge: bcb0288 9a9e0de
Author: bloch at verdurin.com <bloch at verdurin.com>
Date:   Thu Feb 19 23:02:09 2015 +0000

    Merge branch 'master' into f21

 .gitignore   |  3 +++
 sources      |  3 ++-
 yoshimi.spec | 26 ++++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)
---