Merge branch 'workdir'
authorJulian Book <Julian>
Thu, 2 Jan 2014 09:11:48 +0000 (10:11 +0100)
committerJulian Book <jbook@cern.ch>
Thu, 2 Jan 2014 09:11:48 +0000 (10:11 +0100)

Trivial merge