projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac9c417 253a737)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:08:05 +0000 (15:08 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:08:05 +0000 (15:08 +0000)

Trivial merge