]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commit
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)
commita7448acdf7551f09b87233eb697e4d8d42aefaca
tree861634e72c2c7871ece8be3d31aef84940d42771
parentc1c17f2f517c7cdf87244d5b74f648dd0b064151
parentdfe7386f01fe6096589408d97a0b73a2cf8f5906
Merge remote-tracking branch 'stevee/pdns'