# HG changeset patch # User Matti Hamalainen # Date 1213621833 -10800 # Node ID 5ed24c6b6ac4b390d8234d7b27ce75a2c7372f33 # Parent aff6bbdb44bb8a18652423fe39296c82840cc908# Parent 3ceec7ef374a7892b8385b09c9754252948e41fd Automated merge with ssh://hg.atheme.org//hg/users/ccr/xmms-sid