From: Peter Howkins <flibble@users.sf.net>
Date: Fri, 27 Jul 2012 13:43:33 +0000 (+0100)
Subject: Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
X-Git-Tag: 2.2.0a~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2968429c0bfd834d697da2b764b54a6e0b2278e6;p=oweals%2Fcde.git

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

2968429c0bfd834d697da2b764b54a6e0b2278e6