| commit | b9f5365d8ad2acbf20c63569635233d0db991d41 | |
| author | Chris Fields <cjfields@bioperl.org> | |
| Fri, 9 Dec 2011 19:41:04 +0000 (9 13:41 -0600) | ||
| committer | Chris Fields <cjfields@bioperl.org> | |
| Fri, 9 Dec 2011 19:41:04 +0000 (9 13:41 -0600) | ||
| tree | f31d9c05a55b0cf14afb30f8dd1362773d762076 | treesnapshot (tar.gz zip) |
| parent | 8b05e025d4ff83b6e53ca6c342cc9458cc89aea5 | commitdiff |
| parent | ae0cd8fd45c5133a15e8d2e77815f4317ae138d8 | commitdiff |
Merge branch 'master' of https://github.com/fgvieira/bioperl-live into topic/pull_request_28
Fix conflict with SimpleAlign.t tests, use master branch code
Fix conflict with SimpleAlign.t tests, use master branch code