Merge remote-tracking branch 'conifer/feature/CAS_auth_dynamic_links_2_4' into rel_2_...
authorDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:46:13 +0000 (10:46 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:46:13 +0000 (10:46 -0400)
commite54d748e2b163132c08cd94a05f6434776f8b03f
treef971f90af606a6908360e72a63b3ae06c9b845ae
parentf47243f3099e67edb31c6053b30781326b1151d5
parentb3e62feaad82600b262bcbc750f3b40f5a7bf2c9
Merge remote-tracking branch 'conifer/feature/CAS_auth_dynamic_links_2_4' into rel_2_4_mergery