Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Mon, 16 Jul 2012 20:26:53 +0000 (14:26 -0600)
committerJon Trulson <jon@radscan.com>
Mon, 16 Jul 2012 20:26:53 +0000 (14:26 -0600)
commitbc9c6af8c6bc68e5e262b129aa65e75f49bc1d1f
treed165cc341cd57e5a83d4a16b213e39a2af9e8801
parent7604468ca12cdee6846bf737a58dc77d8a6fd7e7
parent6eebf7d42c145c6cc91287b60998754637815a7c
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code