Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 13 Nov 2013 13:05:15 +0000 (14:05 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 13 Nov 2013 13:05:15 +0000 (14:05 +0100)
commitd0d3fe9d266c265697250dabba0bfdac316314ff
tree9280c8d5c71961371cbd319d5f8fbe0dd6b48df8
parent7d3b1f7eafe2122c3b9cc0c46448846158a6abf7
parent1a386bb9d8765a04651f54348d0d1e01d9950235
Merge remote-tracking branch 'origin/next' into fifteen

Conflicts:
lfs/samba
lfs/strongswan
config/rootfiles/common/strongswan
lfs/strongswan