projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1874e2 532b263)
Merge 0.9 -> trunk (like this?)
authorKim Alvefur <zash@zash.se>
Fri, 28 Sep 2012 23:05:17 +0000 (01:05 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 28 Sep 2012 23:05:17 +0000 (01:05 +0200)

Trivial merge