projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a1000e 1b6f768)
Merge s2s branch
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:57:00 +0000 (13:57 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:57:00 +0000 (13:57 +0100)

Trivial merge