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

[Rex Dieter]

commit 8aea4aa7f74f9e42d24660218ef1d7ba5b0833d0
Merge: c6023eb 5c4fd76
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:53:10 2014 -0500

    Merge branch 'master' into f20

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