]> git.ipfire.org Git - people/meitelwein/ipfire-2.x.git/commit
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Dec 2015 20:39:20 +0000 (21:39 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 2 Dec 2015 20:39:20 +0000 (21:39 +0100)
commit74e5c32e19b3752e64c83a4762c7dacfee532bb6
tree9bf865fadd0671ff98d7253ac198f79173165ba0
parent7fd716f81c2ef856be5e69645340aebc7d4d6901
parente5d5819437632e36ccc2950db378e99bb4988443
Merge branch 'master' into next
config/rootfiles/core/96/exclude
config/rootfiles/oldcore/95/filelists/files