projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40e23aa aea275d)
Merge 0.7/waqas->0.7/MattJ
authorMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:46:53 +0000 (19:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:46:53 +0000 (19:46 +0100)

Trivial merge