Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Fri, 3 Aug 2012 16:11:07 +0000 (17:11 +0100)
committerPeter Howkins <flibble@users.sf.net>
Fri, 3 Aug 2012 16:11:07 +0000 (17:11 +0100)
commit2c1daeb413fddee5e03997acdeb9e8f2742bef21
tree1be259e9ce7417ec910efda663e03e61689f6c2f
parent47637b0c3782eaee6c2bf0f9352ec9c9664d1441
parent6e4c5a5cde3e13bc4b7d828afe507c0aae77ca26
Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code