projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbdf93e 76f463b)
Merge
authorKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:34:30 +0000 (05:34 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:34:30 +0000 (05:34 +0100)

Trivial merge