Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Thu, 16 Aug 2012 14:41:15 +0000 (15:41 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Thu, 16 Aug 2012 14:41:15 +0000 (15:41 +0100)
commit0cbd88018aa945819d542e511ae476d01f3f7f67
tree285b390eff7c6064d0e2f29d106a7661486a4afc
parent91b33b715879636fdb76e800d3b87638a8d6ee78
parentce4004f86b82d464f701e429c8f2d74067320c5e
Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code