resolved conflict
authorRichard <richard@richard-neher-mb.local>
Sun, 23 Dec 2012 03:34:32 +0000 (04:34 +0100)
committerRichard <richard@richard-neher-mb.local>
Sun, 23 Dec 2012 03:34:32 +0000 (04:34 +0100)
commit0d991ff60eadbb47a5de60aef3343191934905e1
tree80e2567a5f593d8613e8d21d28f18cfe144a3d54
parentbef09fc910cdc9aba6a7cfd33d1023791d37cf6d
parent9f4350f981f3eecda0b6c4b1dbd808c6f8067b1c
resolved conflict
synmut.tex