projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4924e9c 82f5b95)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Sep 2012 16:07:50 +0000 (17:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Sep 2012 16:07:50 +0000 (17:07 +0100)

Trivial merge