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

@@ -1 +1 @@
-ack-1.86.tar.gz
+/ack-1.94.tar.gz

ack.spec

@@ -1,6 +1,6 @@
 Name:           ack
-Version:        1.92
-Release:        2%{?dist}
+Version:        1.94
+Release:        1%{?dist}
 Summary:        Grep-like text finder
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -41,14 +41,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ack-help.txt ack-help-types.txt Changes README
+%doc ack-help.txt ack-help-types.txt Changes
 %{perl_vendorlib}/*
 %{_bindir}/ack
 %{_mandir}/man1/*
 
 %changelog
-* Wed Aug  4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2
-- rebuild with perl-5.12.1 again
+* Thu Apr 21 2011  <ianburrell@gmail.com> - 1.94-1
+- Update to 1.94
 
 * Wed Jun 16 2010 Ian Burrell <ianburrell@gmail.com> - 1.92-1
 - Update to 1.92

sources

@@ -1 +1 @@
-c25b5a16d0a27386a75c91d531b86cea  ack-1.92.tar.gz
+dcf68e56bab0d394370fa102c7f08cb0  ack-1.94.tar.gz