projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 332edec 184274a)
Merge 0.7/waqas->0.7/MattJ
authorMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:40:53 +0000 (22:40 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:40:53 +0000 (22:40 +0000)

Trivial merge