Merge tag 'upstream/0.7'
authorDiane Trout <diane@caltech.edu>
Tue, 18 Dec 2012 19:58:26 +0000 (11:58 -0800)
committerDiane Trout <diane@caltech.edu>
Tue, 18 Dec 2012 19:58:26 +0000 (11:58 -0800)
commit68c074fc81858150ca7447a88e731eec96be6378
tree78c3466f357ce3ad2a5ad5f3cacd56f8e21cf2cc
parent768881ffd9d33e3c5fa00dd9ea6f488f4f0700b3
parent920cc77ed26707a0d92f9e436121b61d84bde627
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.