OSDN Git Service

Merge branch 'master' into deploy_keys
authormiks <miks@cubesystems.lv>
Thu, 29 Dec 2011 19:46:21 +0000 (21:46 +0200)
committermiks <miks@cubesystems.lv>
Thu, 29 Dec 2011 19:46:21 +0000 (21:46 +0200)
commitf8ad4d2b422af14d57c2c8d49134ef0ef60a1695
treead4ce74ec0fe976cc8928ebf6550c5dcb621d64d
parent723104c45f83937cd87bee87ac16d3dfc6ce4d88
parent78d882623e13f061349ff6237e250970fc48d8a4
Merge branch 'master' into deploy_keys

Conflicts:
app/models/project.rb
app/models/project.rb
app/views/layouts/project.html.haml
config/routes.rb
lib/gitlabhq/gitolite.rb