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)
commit45852949d267ba9543cfc7cf28b15f6cfd3eb62d
tree2b1edeff51a33ddef8b4139587c5ad25afa9c497
parentd4b685ee3dbf69242d14ef7307ec960b4e161edc
parent27fd0790a9efdc6fc3dbc7aff09dea23c020cbda
Merge branch 'working-dir-changes' of git.carlh.net:git/cdist into working-dir-changes