Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Fri, 27 Jul 2012 13:43:33 +0000 (14:43 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 27 Jul 2012 13:43:33 +0000 (14:43 +0100)
commit2968429c0bfd834d697da2b764b54a6e0b2278e6
tree1e27a1a515fa26b6b44e2d3c2c8cf637edc4b9cb
parentbe57b5323278fea28771801157cfcbf5d1fad810
parent80559fcfdd2cafa49496fda33853ee8d5f186c75
Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code