projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 629944d cdf63f8)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Sun, 12 Jul 2009 14:23:39 +0000 (15:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 12 Jul 2009 14:23:39 +0000 (15:23 +0100)

Trivial merge