[perl-Locale-Maketext-Lexicon/f19: 3/3] Merge remote-tracking branch 'origin/f20' into f19

[corsepiu]

commit 0f5c7542271e5a6232480d62021f4e1544a57612
Merge: 3df4754 2277e36
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Feb 6 05:31:43 2014 +0100

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

 .gitignore                        |    2 +-
 perl-Locale-Maketext-Lexicon.spec |   36 +++++++++++++++++++++++++++---------
 sources                           |    2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)
---