Merge remote-tracking branch 'conifer/user/shadowspar/rel_2_3_algoma_tpac' into rel_2...
authorDan Scott <dscott@laurentian.ca>
Fri, 7 Sep 2012 15:03:30 +0000 (11:03 -0400)
committerDan Scott <dscott@laurentian.ca>
Fri, 7 Sep 2012 15:03:30 +0000 (11:03 -0400)

Trivial merge