Merge branch 'master' of rvb.name:gitolite-admin
authorRoman Bazalevsky <rvb@perseus.rvb-home.lan>
Fri, 16 May 2014 14:22:49 +0000 (18:22 +0400)
committerRoman Bazalevsky <rvb@perseus.rvb-home.lan>
Fri, 16 May 2014 14:22:49 +0000 (18:22 +0400)
commitd4fc3ded0001bd272952b70aea696e9daa5570eb
tree03c151c9df73749e8e360150c37fe19ac8a20c30
parent394b2da4a005cec39eefcce9e1652afffd1725b8
parent46588457a2c580f9c6d5ffe6a570151ad3a3236b
Merge branch 'master' of rvb.name:gitolite-admin

Conflicts:
conf/gitolite.conf
conf/gitolite.conf