]> git.proxmox.com Git - mirror_smartmontools-debian.git/commitdiff
Merge commit 'upstream/5.38+svn2879'
authorGiuseppe Iuculano <giuseppe@iuculano.it>
Sun, 30 Aug 2009 16:47:21 +0000 (18:47 +0200)
committerGiuseppe Iuculano <giuseppe@iuculano.it>
Sun, 30 Aug 2009 16:47:21 +0000 (18:47 +0200)
Conflicts:
smartd.conf.5.in


Trivial merge