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)
commit15fbfae62747088414e48ad0bc380a488265af1f
treeee8696856e072eb694cc18bb87333acb739b7336
parent5e9b7dd2c3c0d242c06a48450fef81fcfb5fa29a
parentb5c00b8654ccbe438d6d38d29859c67fbf0a6cc7
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next