Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sourceforge.net>
Mon, 27 Aug 2012 19:25:14 +0000 (20:25 +0100)
committerPeter Howkins <flibble@users.sourceforge.net>
Mon, 27 Aug 2012 19:25:14 +0000 (20:25 +0100)
commit93428391db744ef94bb0112550cfade6baeb3481
tree75a60bc5c73d94305f5b9593fb55ef45b044dfb5
parent3911acddf6d54eac1fc47714dbab806b02b5dde1
parent64d420713545a896f5d4fcb95176fc03533deadc
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code