Merge branch 'master' into topic/locus_controller
commitc24d91c5d6ad9f2c62a4f1888d45a13fd5058118
authorNaama Menda <nm249@cornell.edu>
Wed, 16 Nov 2011 06:49:30 +0000 (16 01:49 -0500)
committerNaama Menda <nm249@cornell.edu>
Wed, 16 Nov 2011 06:49:30 +0000 (16 01:49 -0500)
tree5322f1363bf6a146a982a9726d7767c3153794a3
parent0363fef0f81b736041a0c3b6be1de66542a83853
parent2c0f05534116e65b185f2087e2de4d5e2b2a9a4d
Merge branch 'master' into topic/locus_controller
lib/CXGN/Phenome/Locus.pm