OSDN Git Service

Merge branch 'master' of github.com:gitlabhq/gitlabhq
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 23 Mar 2012 21:01:14 +0000 (23:01 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 23 Mar 2012 21:01:14 +0000 (23:01 +0200)
commitfea64946662a6043ec96c53bf2982d4f51ca4879
tree3986c7423b50c92757f73d3eff27a0a4ad5dcfce
parent255a9e0325471aa270a65201a0b43c77823faf06
parentfd071b571798b979f36ceff67bb1e63d18e4630a
Merge branch 'master' of github.com:gitlabhq/gitlabhq

Conflicts:
resque.sh
resque.sh