From: Peter Howkins <flibble@users.sf.net>
Date: Fri, 3 Aug 2012 16:11:07 +0000 (+0100)
Subject: Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0a~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c1daeb413fddee5e03997acdeb9e8f2742bef21;p=oweals%2Fcde.git

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

2c1daeb413fddee5e03997acdeb9e8f2742bef21