From: Benjamin Mako Hill Date: Sun, 17 Jun 2012 23:23:16 +0000 (-0400) Subject: Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/15870a550ddd18192efc71c1355a238e7c7c53e8?ds=inline Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity --- 15870a550ddd18192efc71c1355a238e7c7c53e8