From: intrigeri <intrigeri@boum.org>
Date: Sat, 11 Dec 2010 12:15:33 +0000 (+0100)
Subject: Merge remote branch 'shared/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1f1e5599b7a527b9889b5d2c8a92df8b2916cde7;p=puppet-common.git

Merge remote branch 'shared/master'

Conflicts:
	lib/puppet/parser/functions/split.rb
---

1f1e5599b7a527b9889b5d2c8a92df8b2916cde7