Merge branches 'dev' and 'master'
Merge branches 'dev' and 'master'
Merge branches 'dev' and 'master'
Merge branches 'dev' and 'master'
Merge branches 'dev' and 'master'
doxygen tags updated
Merge branches 'docs' and 'master'
typedef added to gamete_base
Merge branches 'addtdef' and 'master'
Merge branch 'master' of /home/kevin/git/fwdpp into dev