commit c98dcb04630cb68d8337d6d2e8b6fb848325d80f Merge: 3da9fa2 fe2d6b3 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Mar 20 07:13:39 2014 -0500 Merge commit 'fe2d6b355d61a575ddf9eb960cc23246e37d6d3e' kwallet.spec => kwalletmanager.spec | 0 1 files changed, 0 insertions(+), 0 deletions(-) ---