summaryrefslogtreecommitdiff
path: root/manifests/client
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-03-25 00:04:54 -0400
committerMicah Anderson <micah@riseup.net>2011-03-25 00:04:54 -0400
commitd4ca996f8e6d28d7c8f8ad2c922d6205c6b94dcb (patch)
tree8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/client
parent5218993abef2a8bf79278d4d84123843279735c5 (diff)
parent2648a716c967e22b62b9b4231d26cea06fa6c07a (diff)
Merge remote-tracking branch 'lavamind/master'
Conflicts: templates/munin-node.conf.Debian.squeeze
Diffstat (limited to 'manifests/client')
0 files changed, 0 insertions, 0 deletions