From: selectricity <selectricity@epicenter>
Date: Fri, 31 Aug 2007 21:39:00 +0000 (-0400)
Subject: Merge from devel
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/85e3fa6d1b4627157bf6ef456b46dc6ceafe54c0?hp=-c

Merge from devel
---

85e3fa6d1b4627157bf6ef456b46dc6ceafe54c0