Merge commit 'puzzle/development'
authormh <mh@immerda.ch>
Fri, 13 Jun 2008 20:27:29 +0000 (20:27 +0000)
committermh <mh@immerda.ch>
Fri, 13 Jun 2008 20:27:29 +0000 (20:27 +0000)
commit02588b1934bf63a7bdb7f29661b154ee661071d0
treea3557b83d531f789ff4deaede1cf7c583333aa3c
parent908f654bde83cb6bb2013fdd9861f766535cf1e4
Merge commit 'puzzle/development'
manifests/init.pp