Vassilii Khachaturov 6da4a00375 6960: Error merging citations
Back-port my work on this bug from gramps40.
Unfortunately, the tests on gramps34 still fail (they pass
on gramps40/trunk), but the repro steps marked by Nick
in the bug succeed, so I shall stop here :)

svn: r22965
2013-08-30 19:41:29 +00:00
..