projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb541b9 6327e6e)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 29 Nov 2012 02:16:45 +0000 (07:16 +0500)
committerMatthew Wild <mwild1@gmail.com>
Thu, 29 Nov 2012 02:16:45 +0000 (07:16 +0500)

Trivial merge