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

[Rex Dieter]

commit 76cfeb4a80e3fd67f677d4f4f135ec9716edfef8
Merge: bceb588 2e0b1ac
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 5 12:49:55 2015 -0600

    Merge branch 'master' into f20

 lokalize.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---