]> err.no Git - dak/commit
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)
commit6de9dda69133cf474a9db71bc1bf9d1e4dfe04b5
treed3d62a78b2e370c80d1950ac92b1bf8a730171d5
parent13b7df7bec375026c6870054f20eb1743470ea19
parent904409029a6eba4cde495391a728c2a99c613052
Merge branch 'master' into franck

* master:
  Add the apache configs