From: Kim Alvefur <zash@zash.se>
Date: Wed, 26 Dec 2012 19:35:40 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=13e26026137097feed823b3782037a1d57e3ddd7;hp=f3c095a1e6d0916094c3e0021a43d087a0cb3c57;p=prosody.git

Merge 0.9->trunk
---