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

[Rex Dieter]

commit 263550bc148554ad7de5475832de90f5f2a805db
Merge: 685efc1 c15391e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:49:47 2014 -0500

    Merge branch 'master' into f20

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