From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 16 Aug 2012 14:41:15 +0000 (+0100)
Subject: Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0b~81
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0cbd88018aa945819d542e511ae476d01f3f7f67;p=oweals%2Fcde.git

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

0cbd88018aa945819d542e511ae476d01f3f7f67