From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 30 Aug 2012 20:38:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0b~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b14833740b0f191912908fe2e0ace1d6304f2ec2;p=oweals%2Fcde.git

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

b14833740b0f191912908fe2e0ace1d6304f2ec2