| commit | cfc5c2558967804e21edf012dc0337799c3f0c3e | [log] [tgz] |
|---|---|---|
| author | Igor Sysoev <igor@sysoev.ru> | Thu Jan 20 15:15:50 2011 +0000 |
| committer | Igor Sysoev <igor@sysoev.ru> | Thu Jan 20 15:15:50 2011 +0000 |
| tree | 4af34cd41426337b2fab69af51f721cca30ee2e3 | |
| parent | cc878dc6ac7ad7d36a90276a26b2fee11653d505 [diff] |
move setting conf->server_name in merge phase