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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 29 Mar 2015 17:33:04 +0000 (19:33 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 29 Mar 2015 17:33:04 +0000 (19:33 +0200)
commit	a8d9f5cec1db248c75dc991d21186da554ca48ec
tree	1a16ef4d0213ca74e999b9564a13176d2b3659ce	tree \| snapshot
parent	fffb0165b6f85068a60c9bb816ba09a4d6934fb2	commit \| diff
parent	e0b9a600e19f3829dcdf9858c776d7a169ea2ccc	commit \| diff

Merge remote-tracking branch 'origin/next' into kernel-test

Conflicts:
lfs/openssl-compat