]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c17f2 dfe7386)
Merge remote-tracking branch 'stevee/pdns'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 May 2012 12:33:24 +0000 (14:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 17 May 2012 12:33:24 +0000 (14:33 +0200)

Trivial merge
IPFire 3.x development tree