From: Jon Trulson <jon@radscan.com>
Date: Wed, 25 Jul 2012 00:46:29 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0a~8^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e59c21b8ffaabfc69e67ef906339f42bab9fca4e;p=oweals%2Fcde.git

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

e59c21b8ffaabfc69e67ef906339f42bab9fca4e