projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1de8efd 0ed9e93)
Automated merge with h-h.
authorTobias Markmann <tm@ayena.de>
Sun, 30 Nov 2008 14:18:45 +0000 (15:18 +0100)
committerTobias Markmann <tm@ayena.de>
Sun, 30 Nov 2008 14:18:45 +0000 (15:18 +0100)

Trivial merge