projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0816e4b 3bb270b)
Merge darkrain->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 27 Nov 2010 21:12:44 +0000 (21:12 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 27 Nov 2010 21:12:44 +0000 (21:12 +0000)

Trivial merge