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

[verdurin]

commit 48065a74fb15aa1afb852644901f63345b863053
Merge: 5a1577b 33d6fa2
Author: Adam Huffman <bloch at verdurin.com>
Date:   Sun Mar 8 08:25:17 2015 +0000

    Merge branch 'master' into f21

 .gitignore   |  1 +
 sources      |  3 +--
 yoshimi.spec | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)
---