projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7baa83e 2990fa6)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Thu, 23 Jul 2009 00:38:52 +0000 (01:38 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 23 Jul 2009 00:38:52 +0000 (01:38 +0100)

Trivial merge