From: Jon Trulson <jon@radscan.com>
Date: Mon, 16 Jul 2012 20:26:53 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0a~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc9c6af8c6bc68e5e262b129aa65e75f49bc1d1f;p=oweals%2Fcde.git

Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
---

bc9c6af8c6bc68e5e262b129aa65e75f49bc1d1f