[speed-dreams/f20: 2/2] Merge branch 'master' into f20

[Martin Gansser]

commit cff0f5bc13463aaac207146e44602f302170ced1
Merge: d623bd5 7c2a4e0
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jun 29 00:13:52 2014 +0200

    Merge branch 'master' into f20

 .gitignore        |    5 +++++
 sources           |   10 +++++-----
 speed-dreams.spec |   27 +++++++++++++++------------
 3 files changed, 25 insertions(+), 17 deletions(-)
---