Merge remote-tracking branch 'mfischer/smartmontools' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:56:36 +0000 (23:56 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:56:36 +0000 (23:56 +0100)
commite8b2566ebfa9b4e87c6ee76849be626a6ecf7bcc
tree4d385521b87c0300d1d7cc9fd6f26fdb7864d327
parent2c7c9996c4c67a7c005b61e09400c1eb2e3252af
parent6deed5addbf2ecc899fc4420469372fc98194aee
Merge remote-tracking branch 'mfischer/smartmontools' into next