Merge remote-tracking branch 'conifer/user/dbs/rel_2_3_mergery' into rel_2_3_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Tue, 4 Sep 2012 19:18:06 +0000 (15:18 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 4 Sep 2012 19:18:06 +0000 (15:18 -0400)

Trivial merge