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

[corsepiu]

commit 3df4754292a5b778b229f0c32b8d7e78e1de919a
Merge: 9d6e54c a2b93b9
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Fri Jan 31 13:14:43 2014 +0100

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

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