]> gitweb.fluxo.info Git - puppet-backupninja.git/commitdiff
Merge branch 'master' of code.leap.se:puppet_backupninja into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 10:33:39 +0000 (12:33 +0200)
committervarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 10:33:39 +0000 (12:33 +0200)

Trivial merge