From: Jon Trulson <jon@radscan.com>
Date: Sun, 26 May 2013 23:50:12 +0000 (-0600)
Subject: Merge branch 'master' into multi-monitor
X-Git-Tag: 2.2.0d~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fae50f7b98939407c6634abd8c0185a534f33903;p=oweals%2Fcde.git

Merge branch 'master' into multi-monitor
---

fae50f7b98939407c6634abd8c0185a534f33903