[ack/el6/master: 4/4] Merge branch 'master' into el6

[Ian Burrell]

commit ba76edaed51f5340ee4b2c9c519e6e5d75858408
Merge: 1dcd449 02cdaad
Author: Ian Burrell <ianburrell at gmail.com>
Date:   Thu Apr 21 21:35:26 2011 -0700

    Merge branch 'master' into el6
    
    * master:
      Remove README
      Update to 1.94
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 ack.spec   |   10 +++++-----
 sources    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --cc ack.spec
index 54cb867,72562bb..f057f60
--- a/ack.spec
+++ b/ack.spec
@@@ -47,9 -47,15 +47,9 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/*
  
  %changelog
- * Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2
- - rebuild with perl-5.12.1 again
+ * Thu Apr 21 2011  <ianburrell at gmail.com> - 1.94-1
+ - Update to 1.94
  
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.92-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2
 -- rebuild with perl-5.12.1 again
 -
  * Wed Jun 16 2010 Ian Burrell <ianburrell at gmail.com> - 1.92-1
  - Update to 1.92