Merge remote-tracking branch 'remotes/conifer/feature/fts-polish-l_2_7' into mergery_2_7
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:17 +0000 (07:23 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:17 +0000 (07:23 -0500)
commitc2646f7bfe5af5ce21fce5959ab96dadc24004c6
treee61a8e0e719dea2f958a2ff9a07988a6f0737250
parent54038d23d692f454684405e1c655f595348b5344
parent2202c9b121f76f4b5a05b03bbde9c152a60af1e5
Merge remote-tracking branch 'remotes/conifer/feature/fts-polish-l_2_7' into mergery_2_7