]> 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: a1e89f4 b64c3fc)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Wed, 16 Oct 2013 12:22:38 +0000 (14:22 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 16 Oct 2013 12:22:38 +0000 (14:22 +0200)

Trivial merge
Timo's tree of IPFire 2.x