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

[Rex Dieter]

commit a41590dcea523569b871c0a4e512d4555c057cde
Merge: 6adda95 439ce67
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jan 20 10:49:49 2015 -0600

    Merge branch 'master' into f20

 .gitignore    |    1 +
 sources       |    2 +-
 umbrello.spec |   21 ++++++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)
---