Merge branch 'feature/barcode_generator_2_4' into rel_2_4_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:44:46 +0000 (10:44 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 8 May 2013 14:44:46 +0000 (10:44 -0400)
commitb52e949dbd0db0545b7709fe1bb36612b02a786e
tree253a7a726b10f7ad0e26bee8e36de12c0a8e3e8f
parentc8427c11756dea17355d60f05af36acb1b3ff2e9
parent4e01dfb62a9b8f590123877ac47a1a1f654c4491
Merge branch 'feature/barcode_generator_2_4' into rel_2_4_mergery