2 Commits

Author SHA1 Message Date
Marc Ducobu
090f91e19a resolving conflict 2015-02-06 11:26:09 +01:00
Marc Ducobu
8d5d2189f1 PersonHistoryFile -> AccompanyingPeriod - refs #275 2015-02-06 11:19:36 +01:00