# HG changeset patch # User Kim Alvefur # Date 1355665004 -3600 # Node ID 80cb521507734437b0ac565b5346f7df0fe523f0 # Parent d1baef49be21dc95d33b4a5831c72020fe65e692# Parent 6d8ec8c90240746b038a346c99d5e03840f8a39b Merge 0.9->trunk diff -r 6d8ec8c90240 -r 80cb52150773 prosodyctl