]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71670b9 83dfa1d)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:05 +0000 (20:04 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:05 +0000 (20:04 +0200)

Trivial merge
Matthias' tree of IPFire 2.x