Merge remote-tracking branch 'remotes/conifer/feature/tpac_show_details_config_2_7...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:01 +0000 (07:23 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:01 +0000 (07:23 -0500)

Trivial merge