From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 16 May 2015 07:26:49 +0000 (+0000)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=82f52659d81b3a65130a7133b2e78f88496b58f1;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  replace a few dijkstra occurrences with ubc-bl8

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

Conflicts:
	modules/lvm/manifests/init.pp
---

82f52659d81b3a65130a7133b2e78f88496b58f1