Merge branch 'master' of https://github.com/fgvieira/bioperl-live into topic/pull_req...
commit91b8fb181d5f91f989c77aaef8cbaf58b5ce9630
authorChris Fields <cjfields@bioperl.org>
Fri, 9 Dec 2011 19:41:04 +0000 (9 13:41 -0600)
committerChris Fields <cjfields@bioperl.org>
Fri, 9 Dec 2011 19:41:04 +0000 (9 13:41 -0600)
treec484cfe684e0e4ed4d13049971f615c966b57e20
parentea67fb7247c0403b7faf10eba73b91189d74dacd
parent0ace926836a32d485b42371f42cb8e9a4dbbff17
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
Bio/PopGen/Statistics.pm