projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43d15bf ed925a6)
Merge with Florob
authorMatthew Wild <mwild1@gmail.com>
Sat, 18 Dec 2010 23:08:21 +0000 (23:08 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 18 Dec 2010 23:08:21 +0000 (23:08 +0000)

Trivial merge