Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Sep 2012 14:14:31 +0000 (16:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Sep 2012 14:14:31 +0000 (16:14 +0200)
commite218d500dd4e7d17591df9c449387c00359ee728
tree857156fcb66105e89c4ccfbf5ed38c54c6392935
parentba890f65844a996100f0c2d32832fec53f194f42
parentc7fa84917f1ab16ab01c33a09ca2d76cf53f22d7
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
html/cgi-bin/services.cgi