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

author	Frank Lichtenheld <frank@lichtenheld.de>
	Mon, 3 Nov 2008 22:55:19 +0000 (23:55 +0100)
committer	Frank Lichtenheld <frank@lichtenheld.de>
	Mon, 3 Nov 2008 22:55:19 +0000 (23:55 +0100)
commit	aa2e0fe2326ca54e2cc46959968ba6234f105e25
tree	aea9d1da7f8eab9fb5495f5eb67fec6d583df73d	tree \| snapshot
parent	a9c00d3377390d513bfbe73871f81106b062bf3e	commit \| diff
parent	046ab7b6f324b38f9b223fce074e38848a3d1771	commit \| diff

Merge commit 'local/master' into ubuntu-master

Conflicts:
lib/Deb/Versions.pm