]> code.citadel.org Git - citadel.git/commitdiff
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@mail.ru>
Mon, 16 May 2011 19:14:40 +0000 (21:14 +0200)
committerthe_mgt <themgt@mail.ru>
Mon, 16 May 2011 19:14:40 +0000 (21:14 +0200)

Trivial merge