Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorPeter Howkins <flibble@users.sf.net>
Sat, 27 Dec 2014 23:15:02 +0000 (23:15 +0000)
committerPeter Howkins <flibble@users.sf.net>
Sat, 27 Dec 2014 23:15:02 +0000 (23:15 +0000)
commit1de5d477c998bcd91f438f95db877be97aa4ae81
tree87ad8b6c847be5021a4946c3d8b277ee228a3cc3
parentab743c37e6b8ae146c8da8ea70d852ef3b9f89c2
parent85f6b1d7f3ceb7677c1f53302af947f0356c0769
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code