5 commits

Author	SHA1	Message	Date
Will Farrington	3cde3fa60f	Merge branch 'master' of https://github.com/boxen/our-boxen ... Conflicts: Puppetfile	2012-10-03 11:36:57 -07:00
Will Farrington	5494fe815d	Add some docs to Puppetfile	2012-10-03 11:28:53 -07:00
John Barnette	a9c14be398	Things managed by librarian-puppet go in shared/	2012-10-03 10:24:21 -07:00
Will Farrington	a4c4888519	Update modulefile	2012-10-02 20:21:31 -07:00
Will Farrington	df85943fe0	ZOMG GUISE FUCKIN MODULES AND SHIT	2012-10-02 20:01:49 -07:00