projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbaee30 bbb626c)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Sat, 8 Nov 2008 00:17:00 +0000 (00:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 8 Nov 2008 00:17:00 +0000 (00:17 +0000)

Trivial merge