]> git.ipfire.org Git - people/amarx/ipfire-2.x.git/commitdiff
projects / people / amarx / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c7c999 6deed5a)
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)

Trivial merge
IPFire 2.x development tree