Merge branch 'working-dir-changes' of git.carlh.net:git/cdist into working-dir-changes
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Jul 2014 13:10:17 +0000 (13:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Jul 2014 13:10:17 +0000 (13:10 +0000)

Trivial merge