Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Aug 2013 16:24:03 +0000 (18:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Aug 2013 16:24:03 +0000 (18:24 +0200)
commitae99d423b9ed13c2b7960833b81becd781a1ac58
treef2c6876f1e6bd8d18f3faa75d3a5b93f23a363e3
parent72417e2f7bdffa0c53510215f7dfd866a9da2f38
parentd154ab5899fc6f380be7d42148c2803e7dc3017f
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
make.sh