git.deb.at Git - deb/packages.git/commit

author	Frank Lichtenheld <frank@lichtenheld.de>
	Sat, 31 Jan 2009 19:29:32 +0000 (20:29 +0100)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Sat, 31 Jan 2009 19:29:32 +0000 (20:29 +0100)
commit	9786e970292c154845a5f5dbc3086191ea59a6f0
tree	b13196d354432eb38ac0e6ecd9f58792d08a8bd8	tree \| snapshot
parent	aa2e0fe2326ca54e2cc46959968ba6234f105e25	commit \| diff
parent	4aeff517035be3f0fdddeec04706a04811ce56fc	commit \| diff

Merge branch 'master' into ubuntu-master

Conflicts:
templates/config/mirrors.tmpl