projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4d8383 ad84576)
merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Sun, 2 Nov 2008 02:02:41 +0000 (02:02 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 2 Nov 2008 02:02:41 +0000 (02:02 +0000)

Trivial merge