Merge branch 'rabbitmq' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorStephen Gran <steve@lobefin.net>
Sun, 21 Jun 2015 18:29:51 +0000 (19:29 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 21 Jun 2015 18:29:51 +0000 (19:29 +0100)

Trivial merge