ct-ops.git/global/overlay/usr/local/bin/docker-cleanup, branch master

ct-ops.git/global/overlay/usr/local/bin/docker-cleanup, branch master [no description] Merge branch 'multiverse' 2015-03-22T00:12:40+00:00 Leif Johansson leifj@sunet.se 2015-03-22T00:12:40+00:00 3a8ee7ace2bdd268d870fed9755fb91f21a10c5b Conflicts: global/overlay/etc/puppet/cosmos-modules.conf

Conflicts:
	global/overlay/etc/puppet/cosmos-modules.conf