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)
commitd60ba0379e103579954eee8a940c0df64e7f0076
tree819c47ba44cb04f0e070590d902c33694d15cd24
parente3f4c3a32eee3765fc7b4fe7ff1e6e153939a9f6
parent209edc8199677856f46bf87ee8f70b40dbf264a3
Merge remote-tracking branch 'conifer/feature/tpac_show_details_config_2_4' into rel_2_4_mergery