Ian Kronquist 37d5d08271 (PDOC-19) Fix merge mistakes ... * An empty file got added back in the chaos. Delete it again. * One of the comments was out of date.		2015-07-15 16:35:26 -07:00
..
puppetlabs	(PDOC-19) Fix merge mistakes	2015-07-15 16:35:26 -07:00