projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61a9d8c c750c15)
Merge Zash->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 16 Jul 2010 14:10:45 +0000 (15:10 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 16 Jul 2010 14:10:45 +0000 (15:10 +0100)

Trivial merge