projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de79b8d c2c027e)
Merged Paul's branch
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Sep 2008 20:33:05 +0000 (21:33 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Sep 2008 20:33:05 +0000 (21:33 +0100)

Trivial merge