[perl-CHI/f20: 4/4] Merge remote-tracking branch 'origin/f21' into f20

[corsepiu]

commit 650459bae801bb5861d2e6d935c41a203383c84c
Merge: c53c75b 4b61271
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Jan 8 11:02:55 2015 +0100

    Merge remote-tracking branch 'origin/f21' into f20

 .gitignore    |    2 +-
 perl-CHI.spec |    8 ++++++--
 sources       |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---