[valyriatear/f21: 4/4] Merge branch 'master' into f21

[Erik Schilling]

commit 70aa161353103735c4a1a20f82e8ecb731a05d9f
Merge: 3ddd918 afced0e
Author: Erik Schilling <ablu.erikschilling at googlemail.com>
Date:   Sat Sep 6 00:24:00 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	valyriatear.spec

 .gitignore                        |    2 ++
 sources                           |    2 +-
 valyriatear-fixed-inventory.patch |   30 ------------------------------
 valyriatear-libpng-fix.patch      |   27 ---------------------------
 valyriatear.spec                  |   19 ++++++++++++++-----
 5 files changed, 17 insertions(+), 63 deletions(-)
---