projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bed84ba beb85c3)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)

Trivial merge