commit c6023ebf6083f442516ae09ff042b5ca507ade07
Merge: d1fb2f2 e438132
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 30 23:25:16 2014 -0500
Merge branch 'master' into f20
.gitignore | 6 ++++++
sources | 2 +-
umbrello.spec | 26 +++++++++++++++++++++++++-
3 files changed, 32 insertions(+), 2 deletions(-)
---