g
Merge remote-tracking branch 'xtuple/master' into 20734
Shipment List Item view.
Merge remote-tracking branch 'xtuple/master' into 20734
Merge remote-tracking branch 'origin/20734' into 20734
Cleaning up.
Add shipmentline to model.
Merging in John's branch.
Correct ShipmentLine orm and push to origin.
Merge remote-tracking branch 'xtuple/master' into 20734
Commit and merge Johns branch.
Merge Johns
Start work on relations box for shipment line items
Shipment Line Item box started.
Merge xtuple/master
.
Merge pull request #15 from xtuple/master

2013-07-16
tweak
Merge branch 'master' into 20734
Wrap up work on this branch for now - hopefully.