Merge remote-tracking branch 'sans/master'

This commit is contained in:
Nico Schottelius 2011-04-06 23:43:42 +02:00
commit 47fabf97de

View file

@ -1,5 +1,5 @@
cdist-type__autofs_master(7)
========================
============================
Steven Armstrong <steven-cdist--@--armstrong.cc>