projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 808f755 ed61ca5)
Merge with Markus K?tter
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Apr 2012 02:23:44 +0000 (03:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Apr 2012 02:23:44 +0000 (03:23 +0100)

Trivial merge