projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5747f9 0bbffbb)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Wed, 17 Apr 2013 17:11:57 +0000 (19:11 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 17 Apr 2013 17:11:57 +0000 (19:11 +0200)

Trivial merge