Tim G L Lyons f37ab70446 Merged trunk r18499 through r18539 into geps023.
Conflicts resolved in:
    gramps.pot


svn: r18540
2011-12-02 00:10:04 +00:00
..