projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5466de2 cc99208)
Second merge from waqas
authorMatthew Wild <mwild1@gmail.com>
Tue, 16 Dec 2008 02:40:50 +0000 (02:40 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 16 Dec 2008 02:40:50 +0000 (02:40 +0000)

Trivial merge