Merge branch 'master' of git.puppet.immerda.ch:module-rubygems
authoro <o@immerda.ch>
Sun, 25 Sep 2011 14:40:52 +0000 (16:40 +0200)
committero <o@immerda.ch>
Sun, 25 Sep 2011 14:40:52 +0000 (16:40 +0200)

Trivial merge