From: Diane Trout <diane@caltech.edu>
Date: Tue, 18 Dec 2012 19:58:26 +0000 (-0800)
Subject: Merge tag 'upstream/0.7'
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=pysam.git;a=commitdiff_plain;h=68c074fc81858150ca7447a88e731eec96be6378

Merge tag 'upstream/0.7'

Upstream version 0.7

Conflicts:
	pysam/csamtools.c
	pysam/ctabix.c

Upstream and debian policy disagree about the presence
of the cython c files.
---

68c074fc81858150ca7447a88e731eec96be6378