[perl-Time-Duration-Parse/f19: 2/2] Merge remote-tracking branch 'origin/f20' into f19

[corsepiu]

commit 4a6385ab3d8eaf6bf9e0d872b2731f34d59a6676
Merge: 217ea74 0cbfeef
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Mar 31 07:37:50 2014 +0200

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

 .gitignore                    |    2 +-
 perl-Time-Duration-Parse.spec |    5 ++++-
 sources                       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---