projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 966d46d d6023d7)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Apr 2013 12:53:21 +0000 (13:53 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Apr 2013 12:53:21 +0000 (13:53 +0100)

Trivial merge