Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:48:29 +0000 (18:48 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 16:48:29 +0000 (18:48 +0200)
commit72417e2f7bdffa0c53510215f7dfd866a9da2f38
tree42c0ea6cdb158c0ba925c8ce6c01fd8288566fba
parent6b0a04c0f81ff33793783752aa8275974b12fdd5
parent6ab7955c31ab01cf8fcac874fd5553bc9da89049
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next