tree 77d2d71d98f8f11f035126b52bbaf94148f44c1b
parent 06a01d9dc71aa880df2185dfbd15a701718baab0
parent 9ddc47536ffe8ffb6ec017971a5bfb980d704dbb
author Tony Stevenson <tony@pc-tony.com> 1428446587 +0100
committer Tony Stevenson <tony@pc-tony.com> 1428446587 +0100

Merge branch 'recipient_canonical_maps'

Conflicts:
	manifests/server.pp