From: Jon Trulson <jon@radscan.com>
Date: Fri, 17 Aug 2012 12:01:19 +0000 (-0600)
Subject: Merge branch 'EnvControl-fixes'
X-Git-Tag: 2.2.0b~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e7ec2a4bddf949931516e5f3f5b85e405aa27a0d;p=oweals%2Fcde.git

Merge branch 'EnvControl-fixes'
---

e7ec2a4bddf949931516e5f3f5b85e405aa27a0d