projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06bfc38 6671abf)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Mon, 22 Dec 2008 13:29:59 +0000 (13:29 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 22 Dec 2008 13:29:59 +0000 (13:29 +0000)

Trivial merge