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

[Christopher Meng]

commit 4eecfbcafd6dd92150fb4cbf1ce6d9648e55bdc0
Merge: 798ce05 c9849b7
Author: Koji <koji at fedoraproject.org>
Date:   Mon Aug 26 13:24:59 2013 +0800

    Merge branch 'master' into f18

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