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)
commit9f45c29d82d510404387220115e299f790a4fd0f
tree8b1b76f60ea7361b0436bd49a39b6dd11ac21e2b
parentc04f07529f71e61bd113efb5f4edc2752d73e805
parent3696cbe92847c3a22a775cb149c1766255eee33a
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel