projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4c06e6 5ff53f0)
Merge with tip.
authorTobias Markmann <tm@ayena.de>
Sun, 29 Nov 2009 20:33:37 +0000 (21:33 +0100)
committerTobias Markmann <tm@ayena.de>
Sun, 29 Nov 2009 20:33:37 +0000 (21:33 +0100)

Trivial merge