Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@mail.ru>
Sat, 14 May 2011 22:55:31 +0000 (00:55 +0200)
committerthe_mgt <themgt@mail.ru>
Sat, 14 May 2011 22:55:31 +0000 (00:55 +0200)
commitd49105d4192e5e9a59e56b7522cb21a89087bc22
tree8b1b76f60ea7361b0436bd49a39b6dd11ac21e2b
parent7107b4547c18d6ed1eaf2e36a5ce1e22280301dd
parent9eb8bddf2507dfb629ba045f599378917a086ac9
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel