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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
commit	38c982bb77390f53744815eedb877ebeab05ba4b
tree	56126584f303842887fdcbcdf25f01f7a6524c9c	tree \| snapshot
parent	c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638	commit \| diff
parent	cfac7c232c136363dad5b451549394d996cef1b2	commit \| diff

Merge commit 'origin/master' into next

Conflicts:
src/paks/linux-pae/uninstall.sh