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

Trivial merge