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 10:51:26 +0000 (12:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 10:51:26 +0000 (12:51 +0200)
commit4f64e2090f61fd68dadbaec989b6cb38ba9d9604
tree2331d886ae246a5acf6225eb59d407f00e693653
parent15fbfae62747088414e48ad0bc380a488265af1f
parent83803caf386c3a7fd55215ecad348131be56bba6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
make.sh