merged conflict, take care of figure captions
authorRichard <richard@ag-neher-imac1.eb.local>
Mon, 28 Jan 2013 10:30:32 +0000 (11:30 +0100)
committerRichard <richard@ag-neher-imac1.eb.local>
Mon, 28 Jan 2013 10:30:32 +0000 (11:30 +0100)
commitd0fc9fbc485f2a493b5c49c823fac61def654355
treee8140dc3d5c4f70e0ec5a5a9dc4c1b41a8adcafa
parent7d431b005e000ec35f61447870a60c02e3ab344a
parent499e53bc9dd1c433abfeae6aef67c2ced123df82
merged conflict, take care of figure captions
synmut.tex