[aajohan-comfortaa-fonts/el6: 9/10] Merge branch 'master' into el6 upstream update

[Luya Tshimbalanga]

commit 420eadbc3f3b0a70012c3881bb902ab2b632ec61
Merge: a4e4504 f2f1585
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sun Jan 6 22:27:59 2013 -0800

    Merge branch 'master' into el6
    upstream update

 aajohan-comfortaa-fonts.spec |   23 ++++++++++++++++++++---
 sources                      |    2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)
---