]> jfr.im git - irc/rizon/acid.git/commitdiff
Merge remote-tracking branch 'gl/kb/acid+controlfix'
authorAdam <redacted>
Wed, 17 Sep 2014 03:46:58 +0000 (23:46 -0400)
committerAdam <redacted>
Wed, 17 Sep 2014 03:46:58 +0000 (23:46 -0400)

Trivial merge