]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:30 +0000 (20:30 +0200)
committerAlexander Marx <amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:30 +0000 (20:30 +0200)
commit753bb74ce55d5107d3e8001ed5c15f462261aab3
treec3bedbd2f7b971caa103cad538ec5f591f3a11da
parent2ad3c084eef6d82a8690e5d488d84c61e892ef4e
parentec36876e6ade2e04d29963d8dcfab5d5bf580a99
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen