projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86cd74d 7b84e59)
Merge backed out changeset
authorMatthew Wild <mwild1@gmail.com>
Fri, 29 Jan 2010 03:07:30 +0000 (03:07 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 29 Jan 2010 03:07:30 +0000 (03:07 +0000)

Trivial merge