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)

Trivial merge