]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Mon, 3 Mar 2008 14:08:01 +0000 (15:08 +0100)
committerFrank Lichtenheld <frank@lichtenheld.de>
Mon, 3 Mar 2008 14:08:01 +0000 (15:08 +0100)
commitf6d66b5daf7bd24e43a9e0a91ad5ece09d3d4519
tree4c648cdfdff4d5674161426b8ae08f97eb43a1e4
parent3eda9fe5cb2a6fe0fc67493c2147d8a3ff2d904d
parent212937d8ba5c5fd37a077b4677f4041cf3072bc2
Merge branch 'master' into ubuntu-master

Conflicts:

config.sh.sed.in