From: Peter Howkins <flibble@users.sourceforge.net>
Date: Mon, 27 Aug 2012 19:25:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0b~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=93428391db744ef94bb0112550cfade6baeb3481;p=oweals%2Fcde.git

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

93428391db744ef94bb0112550cfade6baeb3481