]> git.proxmox.com Git - mirror_smartmontools-debian.git/commit
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)
commit4d68e6c82ac9302ab2c5e63bb3f4a350f5941d83
treed5634bce58fcb7b6b4162df8656c73c5068d9817
parent4482c05d345a003e627470230dd5e5b6cd08a2a9
parent2127e1931eec4a688d41baf253744fc48ed8c989
Merge commit 'upstream/5.38+svn2879'

Conflicts:
smartd.conf.5.in