projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70d092b 2be086e)
Merfe from Tobias
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 15:14:59 +0000 (15:14 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 15:14:59 +0000 (15:14 +0000)

Trivial merge