projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ad808a 42162ce)
Automated merge.
authorTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 19:33:14 +0000 (20:33 +0100)
committerTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 19:33:14 +0000 (20:33 +0100)

Trivial merge