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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 29 Jun 2008 20:30:00 +0000 (22:30 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 29 Jun 2008 20:30:00 +0000 (22:30 +0200)
commit	c3dc25fc5ec3c06223a18552ab480e2d983a5fce
tree	e730e8e1aa35143e0e3ddbba3f29ecd3402ec99d	tree \| snapshot
parent	98be0467545476ba18adf1be2c43e5997f262490	commit \| diff
parent	30abdf0eea47f548fa90264a7d1ef594a4b3c918	commit \| diff

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:

tools/make-include