From: Dmitriy Zaporozhets Date: Mon, 21 Oct 2013 06:22:41 +0000 (+0000) Subject: Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq X-Git-Tag: v6.2.0~4 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=584117aa87cbb9c3bc4c43f962fa86bbdda04d25;p=wvm%2Fgitlab.git Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq --- 584117aa87cbb9c3bc4c43f962fa86bbdda04d25