[kde-l10n/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 8a596631b3a3a15523838a2a88c20ef05bdee446
Merge: df56638 75b2174
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 15:19:32 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |   53 ++++++++++++++++++++++++++++
 kde-l10n.spec |    5 ++-
 sources       |  106 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 110 insertions(+), 54 deletions(-)
---