motters/zpanelx — pull request #2 by motters (2012-11-11 20:38:18+00:00)
Title: fix merge issues

fix merge issues