ControlSystemStudio/cs-studio — pull request #717 by shroffk (2014-09-18 17:58:35+00:00)
Title: Nsls2 3.3.x

Merging the nsls2 branch which has logbook and shift development.