]> 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 | compact (merge: 03dd9a2 5c86caa)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Sat, 5 Oct 2013 11:31:22 +0000 (13:31 +0200)
committerAlexander Marx <amarx@ipfire.org>
Sat, 5 Oct 2013 11:31:22 +0000 (13:31 +0200)

Trivial merge
Timo's tree of IPFire 2.x