Merge remote-tracking branch 'remotes/conifer/feature/move_to_storage_2_7' into merge...
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:50 +0000 (07:24 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:24:50 +0000 (07:24 -0500)

Trivial merge