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

[Rex Dieter]

commit df566383d1831bba7d0ab676b94de5757f5feaab
Merge: 70f3d41 6c8752c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 08:45:28 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |  105 +++++++++++++++++++++++++++--------------------------
 kde-l10n.spec    |   29 ++++++++++++---
 sources          |  105 +++++++++++++++++++++++++++--------------------------
 subdirs-kde-l10n |    1 +
 4 files changed, 131 insertions(+), 109 deletions(-)
---