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

[Jon Ciesla]

commit 29621e913d28e2f22091e665755b90d3d935a76e
Merge: 719dbea 24134e9
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Sep 9 08:40:18 2011 -0500

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

 .gitignore                |    7 +
 gitolite-0.95-conf.patch  |   24 ----
 gitolite-0.95-rpm.patch   |  318 -------------------------------------------
 gitolite-1.3-conf.patch   |   10 --
 gitolite-1.3-rpm.patch    |  332 ---------------------------------------------
 gitolite-1.4.2-conf.patch |   10 --
 gitolite-1.4.2-rpm.patch  |  187 -------------------------
 gitolite-1.5-rpm.patch    |  207 ----------------------------
 gitolite-1.5.6-rpm.patch  |  180 ------------------------
 gitolite-1.5.7-rpm.patch  |  138 -------------------
 gitolite-2.0-rpm.patch    |  103 ++++++++++++++
 gitolite.spec             |   57 ++++++--
 sources                   |    2 +-
 13 files changed, 154 insertions(+), 1421 deletions(-)
---