]> gitweb.fluxo.info Git - puppet-concat.git/commitdiff
Merge remote-tracking branch 'ripienaar/master'
authorPeter Meier <peter.meier@immerda.ch>
Wed, 3 Aug 2011 12:27:37 +0000 (14:27 +0200)
committerPeter Meier <peter.meier@immerda.ch>
Wed, 3 Aug 2011 12:27:37 +0000 (14:27 +0200)

Trivial merge