[perl-Guard/el6: 5/5] Merge branch 'el5' into el6

[Nicolas Chauvet]

commit 6b4926d7a68c73993e9d4bbf63908ab460f9dd2a
Merge: b2d0493 c7c6499
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sun Apr 22 21:49:01 2012 +0200

    Merge branch 'el5' into el6
    
    Conflicts:
    	.gitignore
    	perl-Guard.spec
    	sources

 .gitignore      |    2 +-
 perl-Guard.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 67c788e,a9373dc..f23474f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Guard-1.021.tar.gz
 -/Guard-1.022.tar.gz
++Guard-1.022.tar.gz