# HG changeset patch # User Kim Alvefur # Date 1348873517 -7200 # Node ID da7fe5de82fb9ece6ec811d83f91c7280396871f # Parent 0638ff1e1a5ae938794b3930733a506d9414fbc4# Parent a86efd60425f8d2d3fee48d632986c63dd8e0481 Merge 0.9 -> trunk (like this?) diff -r 0638ff1e1a5a -r da7fe5de82fb prosodyctl