]> err.no Git - dak/commit
Merge branch 'merge'
authorJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:38 +0000 (23:43 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:38 +0000 (23:43 +0100)
commit5c6cd875326cabaf5d9670fe9769b9cf3786552e
tree7cc8ed440230f23bb27e1901fc5617636cf65a29
parent4772aaee1b23a2dc718fbbf3c1231908922ec932
parent48a1d3f8272ad4391a693b0239ff8a8853e6ce20
Merge branch 'merge'

* merge:
  fixes from some previous bad merge