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

author	Frank Lichtenheld <frank@lichtenheld.de>
	Sun, 17 Feb 2008 21:22:49 +0000 (22:22 +0100)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Sun, 17 Feb 2008 21:22:49 +0000 (22:22 +0100)
commit	acce36b93fc8530fb50f50ca9edd08e6f6409b04
tree	0a6ef1187151d14a97b94af7b7e2b973a3f95818	tree \| snapshot
parent	7e7cefd4e3e52eff5459452a0a4171922e93dc69	commit \| diff
parent	c6ceebd4baabf30db3259f1225ea5bc90c771740	commit \| diff

Merge commit 'origin/master' into ubuntu-master

Conflicts:

static/index.tmpl