projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f2c997 3a10396)
Merging with main branch.
authorTobias Markmann <tm@ayena.de>
Sun, 23 Nov 2008 19:44:48 +0000 (20:44 +0100)
committerTobias Markmann <tm@ayena.de>
Sun, 23 Nov 2008 19:44:48 +0000 (20:44 +0100)

Trivial merge