]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 14 Mar 2008 23:47:42 +0000 (00:47 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 14 Mar 2008 23:47:42 +0000 (00:47 +0100)
commitc32e5806d3907b53fbd0d64cbb7c6bf7d87ae61d
tree2d6ac0c54b590b5c67300f8098c9cb65babb5575
parentf6d66b5daf7bd24e43a9e0a91ad5ece09d3d4519
parent05972114f36a4a9cb076dec5320337a35462f3b9
Merge branch 'master' into ubuntu-master

Conflicts:

templates/html/show.tmpl