Merge branch 'master' into topic/improve_trial_speed
commit0e1beed214fc321240e521b2d0a2cead56926c0d
authornickmorales <nmorales3142@gmail.com>
Wed, 27 Jan 2016 20:10:30 +0000 (27 20:10 +0000)
committernickmorales <nmorales3142@gmail.com>
Wed, 27 Jan 2016 20:10:30 +0000 (27 20:10 +0000)
tree9edbc18da5bd212b9dc534853ed48107f3aad11d
parent2f2ba839abaef70eac1b162c54579123141dfd98
parentfbe5ba6cb7b427dd13b8b915f5eb4287eec0471e
Merge branch 'master' into topic/improve_trial_speed
merge master
lib/CXGN/Trial.pm
mason/breeders_toolbox/trial.mas