projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b43096 391b07a)
Merge with Maranda
authorMatthew Wild <mwild1@gmail.com>
Fri, 5 Apr 2013 09:04:53 +0000 (10:04 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 5 Apr 2013 09:04:53 +0000 (10:04 +0100)

Trivial merge