projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6351866 f9192eb)
Merge with Tobias
authorMatthew Wild <mwild1@gmail.com>
Sun, 30 Nov 2008 00:38:41 +0000 (00:38 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 30 Nov 2008 00:38:41 +0000 (00:38 +0000)

Trivial merge