projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c318b26 fa6ad64)
Merge
authorMatthew Wild <mwild1@gmail.com>
Fri, 17 Apr 2009 15:16:17 +0000 (16:16 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 17 Apr 2009 15:16:17 +0000 (16:16 +0100)

Trivial merge