projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f953b97 43056e8)
Merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Sun, 9 Nov 2008 23:54:54 +0000 (23:54 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 9 Nov 2008 23:54:54 +0000 (23:54 +0000)

Trivial merge