mfurseman/cs-studio — pull request #1 by willrogers (2014-08-13 13:21:13+00:00)
Title: Changes between your master and my master

This should bring your master up to date. It's a big change.