Dmitriy Zaporozhets 92ef845fa5 Merge branch 'master' into 6-0-dev ... Conflicts: VERSION		2013-07-12 16:16:20 +03:00
..
gitlab	Removal of gitlab.socket should be in stop function too. Fix #4313	2013-07-12 11:48:57 +03:00
gitlab_unicorn	Fix unicorn init and config	2013-07-08 19:28:59 +03:00