projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32ceb5b 4455e95)
Merged with tip.
authorTobias Markmann <tm@ayena.de>
Thu, 26 Nov 2009 23:19:56 +0000 (00:19 +0100)
committerTobias Markmann <tm@ayena.de>
Thu, 26 Nov 2009 23:19:56 +0000 (00:19 +0100)

Trivial merge