]> 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>
Wed, 2 Oct 2013 05:22:10 +0000 (07:22 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 2 Oct 2013 05:22:10 +0000 (07:22 +0200)
commitbcd9852e2ee73b741f5996ecc05ba3758d330fb8
treec3bedbd2f7b971caa103cad538ec5f591f3a11da
parent285de10662731bb67e946e7e112bb4cf892173bf
parentec36876e6ade2e04d29963d8dcfab5d5bf580a99
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen