projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8e4174 b642afe)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 17:40:24 +0000 (17:40 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 17:40:24 +0000 (17:40 +0000)

Trivial merge