[lokalize/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 685efc1afa10e0e0a9036f1b8b8f137afe3f5808
Merge: e0cd966 c03ec09
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:20:24 2014 -0500

    Merge branch 'master' into f20

 .gitignore    |    6 ++++++
 lokalize.spec |   23 ++++++++++++++++++++++-
 sources       |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---