commit 96f9c3d1e82a5c44cc908697b0d72108649b389c Merge: 5787865 f798022 Author: Will Woods <wwoods at redhat.com> Date: Sat Jun 2 14:45:34 2012 -0400 Merge branch 'master' into f15 davfs2.spec | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) ---