projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6461123 5c1228d)
Merge Tobias->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 17 Dec 2010 13:50:33 +0000 (13:50 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 17 Dec 2010 13:50:33 +0000 (13:50 +0000)

Trivial merge