]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cf4a7f b66edc1)
Merge branch 'dnsmasq-dnssec' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 08:52:36 +0000 (10:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 08:52:36 +0000 (10:52 +0200)

Trivial merge
Timo's tree of IPFire 2.x