]> 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: 5f20677 e798fee)
Merge remote-tracking branch 'stevee/core-90-ddnsctrl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:20 +0000 (11:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Apr 2015 09:26:20 +0000 (11:26 +0200)

Trivial merge
Timo's tree of IPFire 2.x