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

author	Frank Lichtenheld <frank@lichtenheld.de>
	Mon, 21 Apr 2008 18:06:31 +0000 (20:06 +0200)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Mon, 21 Apr 2008 18:06:31 +0000 (20:06 +0200)
commit	587dcc6f49188c0a2076e7316643f90a7c3d1d5a
tree	5b3b0ae402688144df63b7e90ecb0961a30a7d29	tree \| snapshot
parent	974926bc9499febca5504f5e4da8e4733ddd960e	commit \| diff
parent	7f5251931aa1c43d71d8da89f8d111203ec2cedb	commit \| diff

Merge branch 'master' into ubuntu-master

Conflicts:

templates/html/head.tmpl