Merge branch 'master' into topic/update_jbrowse_referencessgn-175.0
commit15a1b15115ce7e80d25bc27db6838a7aca927d37
authorbellerbrock <bje24@cornell.edu>
Wed, 11 May 2016 15:11:58 +0000 (11 17:11 +0200)
committerbellerbrock <bje24@cornell.edu>
Wed, 11 May 2016 15:11:58 +0000 (11 17:11 +0200)
tree1d55a52919c8be1c0f9878040255ded1d65e7c73
parentd5c0c7f4f6762e6291fe3dbe0fe67576ee18baf9
parent451ae85f4b4cd57354d72045e70c381844124e1c
Merge branch 'master' into topic/update_jbrowse_references