Merge remote-tracking branch 'conifer/feature/tpac_show_details_config_2_4' into...
authorDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:51:00 +0000 (10:51 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:51:00 +0000 (10:51 -0400)

Trivial merge