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

[Martin Gansser]

commit c499abd2846f0daafab13842b0a432c35320e250
Merge: 510d9c9 48528a9
Author: Martin Gansser <mgansser at alice.de>
Date:   Wed May 7 21:45:16 2014 +0200

    Merge branch 'master' into f20

 .gitignore |    1 +
 sources    |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
---