Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code
authorJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:48:55 +0000 (17:48 -0600)
committerJon Trulson <jon@radscan.com>
Sun, 26 May 2013 23:48:55 +0000 (17:48 -0600)
commit7006fbc8bf63cf9b1e46939b9236b5fccb0cc465
treeb7390f652e752f0815f79f225aa1a9622f609e1c
parent8a8619bfa8a25342d898d2cc4decd7bb66b9c060
parent3bd9b4c4da9bdd206eac95d65aa2cd10bed94950
Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code