]> err.no Git - dak/commitdiff
Merge branch 'master' into security
authorJoerg Jaspert <joerg@debian.org>
Sun, 12 Dec 2010 14:52:37 +0000 (15:52 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sun, 12 Dec 2010 14:52:37 +0000 (15:52 +0100)
* master:
  fixme note


Trivial merge