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

[Rex Dieter]

commit 42079fac04431d283930045489d2ae6bf4e0e343
Merge: 05d31da af3c5ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:31:18 2014 -0500

    Merge branch 'master' into f20

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