]> 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: 95c8665 e6e9a81)
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:42 +0000 (07:25 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:42 +0000 (07:25 +0200)

Trivial merge
Peter's tree of IPFire 2.x