Merge branch 'feature/circ_scripts_2_4' into rel_2_4_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:23:54 +0000 (10:23 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:23:54 +0000 (10:23 -0400)

Trivial merge