Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 17 Jul 2013 15:45:40 +0000 (17:45 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 17 Jul 2013 15:45:40 +0000 (17:45 +0200)

Trivial merge