Merge branch 'feature/circ_scripts_2_7' into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:26 +0000 (13:59 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:59:26 +0000 (13:59 -0500)

Trivial merge