projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7322dd ee50d92)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 13:20:02 +0000 (14:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 13:20:02 +0000 (14:20 +0100)

Trivial merge