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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 10 Apr 2011 08:44:33 +0000 (10:44 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sun, 10 Apr 2011 08:44:33 +0000 (10:44 +0200)
commit	e865603286978e87a7611cf4471d4844f8ef73e4
tree	9b0c5788c57ac91a595b10650302b3ef619e4238	tree \| snapshot
parent	9f0b9436d83a7a97dbeb26060325567eb61fc627	commit \| diff
parent	603e55bb100e5c46b298d84b702e0d560d97ed03	commit \| diff

Merge branch 'master' into kernel36

Conflicts:
config/rootfiles/common/Mail-Tools