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)
1  2 
html/cgi-bin/services.cgi

Simple merge