Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/python-pysam
authorAfif Elghraoui <afif@ghraoui.name>
Sat, 25 Jul 2015 18:50:06 +0000 (11:50 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Sat, 25 Jul 2015 18:50:06 +0000 (11:50 -0700)
I made some commits before pulling the changelog update by Andreas.


Trivial merge