projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e31e045 231307a)
Merge with tip.
authorTobias Markmann <tm@ayena.de>
Tue, 1 Dec 2009 19:55:32 +0000 (20:55 +0100)
committerTobias Markmann <tm@ayena.de>
Tue, 1 Dec 2009 19:55:32 +0000 (20:55 +0100)

Trivial merge