]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82b837c 3a3759c)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen1
authorAlexander Marx <amarx@ipfire.org>
Mon, 9 Dec 2013 08:29:50 +0000 (09:29 +0100)
committerAlexander Marx <amarx@ipfire.org>
Mon, 9 Dec 2013 08:29:50 +0000 (09:29 +0100)

Trivial merge
IPFire 2.x development tree