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

[Rex Dieter]

commit 157e6df9887a309ed5bcecb4bd1598512daeb470
Merge: 2644a63 9c90ddb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:26:33 2014 -0600

    Merge branch 'master' into f20

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