From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 28 Nov 2012 01:08:12 +0000 (-0800)
Subject: Merge branch '2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=be6d45632511cfb04748c8bcbe1e8a4831f3755b;p=puppet-stdlib.git

Merge branch '2.x' into 3.x

* 2.x:
  Revert "(Maint) Add spec/functions to rake test task"

Conflicts:
	Rakefile
---

be6d45632511cfb04748c8bcbe1e8a4831f3755b