git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 1 Dec 2014 08:51:40 +0000 (09:51 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 1 Dec 2014 08:51:40 +0000 (09:51 +0100)
commit	7370484e87052bfc6f9e146d925adab203f1cea0
tree	445a9a15265c94f202f4361792479668c931b843	tree \| snapshot
parent	4091a94508e8d4485c98dd64c5a3fe1c7282986c	commit \| diff
parent	f0e77571c033b74e7d8eb2757c73864ce12d06f9	commit \| diff

Merge remote-tracking branch 'origin/next'

Conflicts:
make.sh