[perl-Kwiki-Attachments/el6: 11/11] Merge with devel.

[Steven Pritchard]

commit 94bc9a92baac13c3a5c91991775dab019a956247
Merge: 9b04bec fe39321
Author: Steven Pritchard <steven.pritchard at gmail.com>
Date:   Sun Oct 2 16:55:19 2011 -0500

    Merge with devel.

 .gitignore                  |    2 +-
 perl-Kwiki-Attachments.spec |   29 +++++++++++++++++++++++++++--
 sources                     |    2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 53dad4f,b583fc6..b079ab9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Kwiki-Attachments-0.18.tar.gz
+ /Kwiki-Attachments-0.21.tar.gz