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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 30 Oct 2010 19:37:44 +0000 (21:37 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 30 Oct 2010 19:37:44 +0000 (21:37 +0200)
commit	57e682114e87ea9ed4cc419aea17dfd63cf3917b
tree	740ee7789c09584d58e6472c82678f40c5f82c2e	tree \| snapshot
parent	933377600e8230e688cd760d031af538c2f4c8bf	commit \| diff
parent	4b8ede3119e17390a0ca799f39ef31d6bdfb1905	commit \| diff

Merge commit 'origin/master' into next

Conflicts:
make.sh