Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Thu, 30 Aug 2012 19:53:37 +0000 (13:53 -0600)
committerJon Trulson <jon@radscan.com>
Thu, 30 Aug 2012 19:53:37 +0000 (13:53 -0600)
commita06126dd4cd2c3d4b0604d2357045556cf56472e
tree3546ea2c63b1a96b1be32da3f421aa8882f2e689
parentd0b5ebebd94827b6fcb2bc8f6a66bdba6d109b3b
parentf6bfbcb521b8137fcfbae358d3cfc63822456d6b
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code