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

[Rex Dieter]

commit 736a63e49dd2a63ce115d693cc11f3d72817969d
Merge: 25a9b74 12ef441
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 12:33:03 2014 -0600

    Merge branch 'master' into f20

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