projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cf1a05 3f9539f)
Merge 0.7/waqas->0.7/MattJ
authorMatthew Wild <mwild1@gmail.com>
Sun, 23 May 2010 22:05:01 +0000 (23:05 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 23 May 2010 22:05:01 +0000 (23:05 +0100)

Trivial merge