Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Sat, 27 Dec 2014 21:25:52 +0000 (14:25 -0700)
committerJon Trulson <jon@radscan.com>
Sat, 27 Dec 2014 21:25:52 +0000 (14:25 -0700)
commit85f6b1d7f3ceb7677c1f53302af947f0356c0769
treeb6378d271eeca287f30a867a3b5087a5b4b97538
parent7484c6f88b656a8e2eed1f1a7a7c9fb1204b4f73
parentc768260785066b91ce8f9462ebb611e173f64dcb
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code