[perl-Kwiki-Diff/el6: 10/10] Merge branch 'master' into el6

[Steven Pritchard]

commit 2e796d12dd4293c1b098324a223c9f1250ffedd4
Merge: cfe8136 75185e7
Author: Steven Pritchard <steven.pritchard at gmail.com>
Date:   Sun Oct 2 16:58:36 2011 -0500

    Merge branch 'master' into el6

 perl-Kwiki-Diff.spec |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)
---