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

templates/html/show.tmpl


Trivial merge