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

[corsepiu]

commit d9a295284c466cd1007b8632e61f2b54d0eea0c4
Merge: c4a3bc7 a52090f
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Jan 8 08:30:37 2015 +0100

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

 .gitignore                        |    2 +-
 perl-POSIX-strftime-Compiler.spec |    8 +++++---
 sources                           |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---