]> git.deb.at Git - deb/packages.git/commit
Merge branch 'master' into ubuntu-master
authorFrank Lichtenheld <frank@lichtenheld.de>
Thu, 11 Jun 2009 17:26:31 +0000 (19:26 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Thu, 11 Jun 2009 17:26:31 +0000 (19:26 +0200)
commit70fbc048de65db4f013ce06b16fa5e01fc26c8b0
tree57b3550a077252362f1433194ece6e1608d47c18
parent0a408bcfa254712cd4f4ed0bd19bc24d412a6eb6
parent53ec702600ecf0c792e9df5e6422a77e92ce5ad6
Merge branch 'master' into ubuntu-master

Conflicts:
config.sh.sed.in
config.sh.sed.in