projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b247d6 d255e79)
Merging with tip.
authorTobias Markmann <tm@ayena.de>
Sat, 14 Feb 2009 18:13:14 +0000 (19:13 +0100)
committerTobias Markmann <tm@ayena.de>
Sat, 14 Feb 2009 18:13:14 +0000 (19:13 +0100)

Trivial merge