projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6d2f3a c5ca9ef)
Merge hoelzro->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 15 Oct 2010 16:07:17 +0000 (17:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 15 Oct 2010 16:07:17 +0000 (17:07 +0100)

Trivial merge