projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 899e1fd d176f4f)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 11 May 2014 23:18:27 +0000 (01:18 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 11 May 2014 23:18:27 +0000 (01:18 +0200)

Trivial merge