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

author	Frank Lichtenheld <frank@lichtenheld.de>
	Wed, 16 Apr 2008 21:12:19 +0000 (23:12 +0200)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Wed, 16 Apr 2008 21:12:19 +0000 (23:12 +0200)
commit	3c396ed67e80cc413303725209ebcfe7b3e36554
tree	2c064bee5a11c03b7fbd2917856e77c6ef83544a	tree \| snapshot
parent	c32e5806d3907b53fbd0d64cbb7c6bf7d87ae61d	commit \| diff
parent	62bcf20caddf01f1f8158952a7c914fbeb3231d4	commit \| diff

Merge branch 'master' into ubuntu-master

Conflicts:

templates/html/show.tmpl