projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b1291c 66ce21b)
Another automatic merge, this gets annoying."
authorTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 21:11:21 +0000 (22:11 +0100)
committerTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 21:11:21 +0000 (22:11 +0100)

Trivial merge