[oxygen-fonts/f21: 6/6] Merge branch 'master' into f21

[Rex Dieter]

commit 65a3d853c71027e7581e3a7d5fecf1cc274b5934
Merge: c7c78ec 4b75b07
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Oct 20 10:13:51 2014 -0500

    Merge branch 'master' into f21
    
    Conflicts:
    	oxygen-fonts.spec

 disable-broken-fontforge-in-rawhide.patch |   25 +++++++++++++++++++++++++
 oxygen-fonts.spec                         |   28 ++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 8 deletions(-)
---