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-01-13 18:32:42 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00
2006-11-10 05:52:14 +00:00