projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92b3a4a dfe2180)
Merged 2 heads o_O
authormatthew@silver <matthew@silver>
Sun, 24 Aug 2008 17:08:04 +0000 (18:08 +0100)
committermatthew@silver <matthew@silver>
Sun, 24 Aug 2008 17:08:04 +0000 (18:08 +0100)

Trivial merge