projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1457ad1 363f6b8)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 10 May 2013 09:46:27 +0000 (10:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 10 May 2013 09:46:27 +0000 (10:46 +0100)

Trivial merge