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
..
2010-10-31 07:33:17 +00:00
2009-12-21 13:43:50 +00:00
2011-07-07 02:37:52 +00:00
2010-09-30 22:43:09 +00:00