projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 930d1bd 92df1c9)
Merge from waqas/myself
authorMatthew Wild <mwild1@gmail.com>
Sat, 6 Dec 2008 03:42:21 +0000 (03:42 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 6 Dec 2008 03:42:21 +0000 (03:42 +0000)

Trivial merge