projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1dd4f15 c9a6f6b)
Merging.
authorTobias Markmann <tm@ayena.de>
Mon, 10 Nov 2008 15:29:19 +0000 (16:29 +0100)
committerTobias Markmann <tm@ayena.de>
Mon, 10 Nov 2008 15:29:19 +0000 (16:29 +0100)

Trivial merge