projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d7db68 6440519)
Merge Zash->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:45:06 +0000 (22:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:45:06 +0000 (22:45 +0100)

Trivial merge