Merge tag 'upstream/0.7.6'
authorCharles Plessy <plessy@debian.org>
Sat, 19 Apr 2014 02:41:42 +0000 (11:41 +0900)
committerCharles Plessy <plessy@debian.org>
Sat, 19 Apr 2014 02:41:42 +0000 (11:41 +0900)
Upstream version 0.7.6

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/python-pysam-tests.README.Debian
debian/python-pysam-tests.install
debian/rules
debian/tests/control
debian/tests/run-unit-test
debian/watch


Trivial merge