[libXfont/f19: 7/7] Merge remote-tracking branch 'origin/master' into f19

[Hans de Goede]

commit e72917e06cd62c0efe3785ed3d3668f993604b27
Merge: 92f16f1 b5437ca
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jul 9 15:19:58 2014 +0200

    Merge remote-tracking branch 'origin/master' into f19
    
    Conflicts:
    	libXfont.spec

 .gitignore                            |    3 ++
 libXfont-1.4.7-fontproto-compat.patch |   34 ++++++++++++++++++++++
 libXfont.spec                         |   50 +++++++++++++++++++-------------
 sources                               |    2 +-
 4 files changed, 68 insertions(+), 21 deletions(-)
---