projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df7a47e 5b40679)
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 May 2011 01:34:59 +0000 (03:34 +0200)
committerthe_mgt <themgt@uncensored.citadel.org>
Wed, 18 May 2011 01:34:59 +0000 (03:34 +0200)

Trivial merge
Citadel server, clients, utilities