[chinese-calendar/f18: 2/2] Merge branch 'master' into f18

[Christopher Meng]

commit ab2b7057e8c900c21dba5cdaa42718cbc8d1b2c1
Merge: 4eecfbc 1501539
Author: Koji <koji at fedoraproject.org>
Date:   Mon Aug 26 13:45:38 2013 +0800

    Merge branch 'master' into f18

 chinese-calendar.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---