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

[Martin Gansser]

commit d623bd57ddf60031f792af4eba5c800679d4e703
Merge: ac4def0 b686a45
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri Jun 27 18:08:52 2014 +0200

    Merge branch 'master' into f20

 .gitignore        |    5 +++++
 sources           |   10 +++++-----
 speed-dreams.spec |   30 ++++++++++++++++--------------
 3 files changed, 26 insertions(+), 19 deletions(-)
---