Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Tue, 18 Sep 2012 00:23:31 +0000 (18:23 -0600)
committerJon Trulson <jon@radscan.com>
Tue, 18 Sep 2012 00:23:31 +0000 (18:23 -0600)
commit735bdff39232a29392ee9e2c8eb66d2a285bfb58
tree2db48fcf30c743f99d0dfab41aecaaa0ce1e6d1a
parent464bc5b3f62c4f58d27cb9b9140d2a0e1478b9ad
parentdcdd21df3431e532728b9dbda6d2519921336f8e
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code