]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
authorintrigeri <intrigeri@boum.org>
Wed, 2 Jan 2013 15:14:06 +0000 (16:14 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 2 Jan 2013 15:14:06 +0000 (16:14 +0100)
commit517040bb2e088325c2baa5bc4e9860d218357669
treeeeca8062bf072c780aafe6f3b6ae22782a8e1914
parentcda713fcf6bd189c3e870c9e466aa5f41d1847b6
parent07a031f2050deecfefa205e1e0c63586692a06ff
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared

Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
README
manifests/init.pp
manifests/preferences.pp