projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3071473 e9978ff)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 12 Jun 2011 21:21:10 +0000 (22:21 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 12 Jun 2011 21:21:10 +0000 (22:21 +0100)

Trivial merge