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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sat, 7 Jan 2012 20:13:15 +0000 (21:13 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sat, 7 Jan 2012 20:13:15 +0000 (21:13 +0100)
commit	3561a2757c589b686a69a89c704907f685ece490
tree	7b6149245975e9be71375aa79241e6eb5860128f	tree \| snapshot
parent	b1398028c2d44f70b54a06ff1fbf7726fcb39a39	commit \| diff
parent	24bb6d49fa60ca272cb3848da8b8a59cb6408302	commit \| diff

Merge remote-tracking branch 'stevee/libtiff'

Conflicts:
libtiff/libtiff.nm