]> err.no Git - dak/commitdiff
Merge branch 'master' into franck
authorJoerg Jaspert <joerg@debian.org>
Fri, 2 Jul 2010 19:26:44 +0000 (21:26 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 2 Jul 2010 19:26:44 +0000 (21:26 +0200)
* master:
  Add the apache configs


Trivial merge