projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9959598 a8537ca)
Merged branches
authorDwayne Bent <dbb.0@liqd.org>
Thu, 2 Jul 2009 19:23:09 +0000 (15:23 -0400)
committerDwayne Bent <dbb.0@liqd.org>
Thu, 2 Jul 2009 19:23:09 +0000 (15:23 -0400)

Trivial merge