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

[Jon Ciesla]

commit 67dd44d0fa74156c79f6f9ab055f94d5b79cc769
Merge: c3532d8 4a9e455
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Mar 23 08:30:15 2012 -0500

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

 gitolite-2.3-configgen.patch |   12 ++++++++++++
 gitolite.spec                |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---