]> 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: b2e333d 9999b25)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pre-firewall
authorAlexander Marx <amarx@ipfire.org>
Wed, 5 Jun 2013 20:11:44 +0000 (22:11 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 5 Jun 2013 20:11:44 +0000 (22:11 +0200)

Trivial merge
Timo's tree of IPFire 2.x