Tim G L Lyons 3adb1b7ffa Merged trunk r17888 through r18397 into geps023.
Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405
2011-11-05 19:07:58 +00:00
..
2011-09-28 18:14:16 +00:00
2011-10-23 03:13:50 +00:00
2009-12-21 13:03:08 +00:00
2011-08-08 07:10:34 +00:00