projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd154c6 27f12be)
Merge with Tobias
authorMatthew Wild <mwild1@gmail.com>
Mon, 10 Aug 2009 13:29:28 +0000 (14:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 10 Aug 2009 13:29:28 +0000 (14:29 +0100)

Trivial merge