commit cdbd9759b97a5eca76d0bbd60a2599ccb3531624 Merge: c61151d 8cb9d06 Author: Rex Dieter <rdieter at math.unl.edu> Date: Tue Jan 20 11:13:01 2015 -0600 Merge branch 'f21' into f20 .gitignore | 2 ++ kde-print-manager.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) ---