Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
commitde0ccf8f8c9fc6b695f45a3fdcf0a85c3b3d5299
tree784ef91696e1a40d0b9edebb1a6e2b3c671c4e44
parent60620d3d4385628f9c5c7725d042b742940bbb28
parentb6301464d409c186ea2ae9a13bbe46251e833c85
Merge branch 'master' into next

Conflicts:
make.sh
config/rootfiles/common/armv5tel/initscripts
lfs/initscripts
lfs/strongswan
make.sh