]> 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: 654a8ec 7eb25cb)
Merge remote-tracking branch 'ferstl/dynu-ddns-fix' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:24:29 +0000 (19:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Jun 2014 17:24:29 +0000 (19:24 +0200)

Trivial merge
Timo's tree of IPFire 2.x