projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2be086e c3c8ead)
Automated merge.
authorTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 19:30:35 +0000 (20:30 +0100)
committerTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 19:30:35 +0000 (20:30 +0100)

Trivial merge