projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd54730 1667e0c)
Merge with tip.
authorTobias Markmann <tm@ayena.de>
Mon, 30 Nov 2009 22:25:10 +0000 (23:25 +0100)
committerTobias Markmann <tm@ayena.de>
Mon, 30 Nov 2009 22:25:10 +0000 (23:25 +0100)

Trivial merge