]> 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: 9f6da93 1a3dbe9)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:19 +0000 (07:25 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:19 +0000 (07:25 +0200)

Trivial merge
Peter's tree of IPFire 2.x