From: varac Date: Sun, 14 Apr 2013 10:33:39 +0000 (+0200) Subject: Merge branch 'master' of code.leap.se:puppet_backupninja into nadir_master X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2ce6a99e0e0fdfd4555c5e6c15731a7fae45da2e;p=puppet-backupninja.git Merge branch 'master' of code.leap.se:puppet_backupninja into nadir_master --- 2ce6a99e0e0fdfd4555c5e6c15731a7fae45da2e