Merge commit 'upstream/0.6'
authorDiane Trout <diane@caltech.edu>
Wed, 14 Dec 2011 01:03:38 +0000 (17:03 -0800)
committerDiane Trout <diane@caltech.edu>
Wed, 14 Dec 2011 01:03:38 +0000 (17:03 -0800)
commit36e29386e0547c68f3468c92781c67cf5e180903
treec637a3b1a04c7f69f06535ef94c0acab2b0d7690
parent3af2785da461666b27cc5b71e36ccd8deb7532fb
parentca46ef4ba4a883c57cea62d5bf1bc021f1185109
Merge commit 'upstream/0.6'

Delete files generated by cython.

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