]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e646102 6ace85e)
Merge branch 'subnets_as_grps' of https://github.com/hadfl/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:34:10 +0000 (11:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:34:10 +0000 (11:34 +0200)

Trivial merge
Peter's tree of IPFire 2.x