projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cc5c9a 24dae78)
Merge with main branch.
authorTobias Markmann <tm@ayena.de>
Sun, 5 Jul 2009 17:05:25 +0000 (19:05 +0200)
committerTobias Markmann <tm@ayena.de>
Sun, 5 Jul 2009 17:05:25 +0000 (19:05 +0200)

Trivial merge