Try to see if we fixed this misery
authorMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 18:12:46 +0000 (20:12 +0200)
committerMarco <marco@theanarchistlibrary.org>
Thu, 17 May 2012 18:12:46 +0000 (20:12 +0200)
commit366209f76e3d7b4850afddb2f50bd768fe0261b1
treee2fdf739b27cacfe8be221458480eb8c5f63ada3
parent1313baa95708b726a07413a4db5ec2b626886e52
Try to see if we fixed this misery

  *  edited              templates/merge.body.tt
  *  edited              templates/merge.head.tt
templates/merge.body.tt
templates/merge.head.tt