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

[Daniel Vrátil]

commit c9e8b11481b1ccff3a1cb1ec008b5df54e4973ab
Merge: 6970bcf b5f344f
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Feb 13 18:04:45 2015 +0100

    Merge branch 'master' into f21

 oxygen-fonts.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---