]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eda9fe 212937d)
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)
Conflicts:

config.sh.sed.in


Trivial merge