[gitolite/el6: 6/6] Merge branch 'master' into el6

[Jon Ciesla]

commit c3532d86f63c8b496f5873b38f51141b4b88b1b1
Merge: 91a89d8 04ac135
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Mar 22 09:00:33 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	gitolite.spec

 .gitignore             |    4 +++
 gitolite-2.0-rpm.patch |   51 +++++++----------------------------------------
 gitolite-README-fedora |    7 ++++++
 gitolite.spec          |   20 +++++++++++++++---
 sources                |    2 +-
 5 files changed, 36 insertions(+), 48 deletions(-)
---
diff --cc gitolite.spec
index 3db964f,bd8a5bf..0190f6e
--- a/gitolite.spec
+++ b/gitolite.spec
@@@ -117,9 -118,27 +119,19 @@@ exit 
  
  
  %changelog
 -* Thu Feb 16 2012 Jon Ciesla <limburgher at gmail.com> - 2.3-1
++* Thu Mar 22 2012 Jon Ciesla <limburgher at gmail.com> - 2.3-1
+ - Created VERSION at build time.
+ - Stop calling rpm to get version.
+ - Update to 2.3.
 -
 -* Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-2
+ - Include sshkeys-lint.  Thanks Mukund Sivaraman!
+ - Patched to prevent abort at version check, BZ 781589.
 -
 -* Sun Jan 08 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-1
 -- 2.2.1.
 -
 -* Thu Nov 17 2011 Jon Ciesla <limb at jcomserv.net> - 2.2-1
 -- 2.2.
 -
 -* Fri Sep 30 2011 Jon Ciesla <limb at jcomserv.net> - 2.1-1
 -- 2.1.
+ - Updated README to warn admins about variables that
+ - need to be set in .gitolite.rc and may not be from
+ - older installs.
+ 
 +* Fri Feb 17 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.3-3
 +- Fixed version handling.
 +
  * Mon Aug 08 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.3-2
  - Updated rpm patch to fix hooks, BZ 713020.