Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 20:38:11 +0000 (21:38 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Thu, 30 Aug 2012 20:38:11 +0000 (21:38 +0100)
commitb14833740b0f191912908fe2e0ace1d6304f2ec2
tree34cb9e05e8421371c93e9d1805d5979107384c6a
parent71f8af6943b9f0ea6d290c1497bf1b3a78be18c0
parentee7caf532be197e6f87a39afadeb3d45a59111ee
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code