]> git.ipfire.org Git - ipfire-2.x.git/commit
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 11:15:11 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 11:15:11 +0000 (13:15 +0200)
commitb829fa10cc91535ca9b8c7708b3168dd54d34e9c
treeac20b7bc8d3bd919e0d247c59222ca81fdefacec
parent3090c39efd011f4da22fb076cf9fde846619c688
parentb0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5