Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Fri, 17 Aug 2012 09:26:09 +0000 (10:26 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Fri, 17 Aug 2012 09:26:09 +0000 (10:26 +0100)
commit90376fc6d8975903ad637c995f6183f39b0c2a69
treef51ead27c50658ccc5f5302e08ea5959a950b61b
parent0cbd88018aa945819d542e511ae476d01f3f7f67
parent466191d66923323da159eb2aad78d2c2a9f7f879
Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code