projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ace9627 6662f24)
Merge with myself (!)
authorMatthew Wild <mwild1@gmail.com>
Sat, 15 Nov 2008 23:22:27 +0000 (23:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 15 Nov 2008 23:22:27 +0000 (23:22 +0000)

Trivial merge