From: Diane Trout <diane@caltech.edu>
Date: Wed, 14 Dec 2011 01:03:38 +0000 (-0800)
Subject: Merge commit 'upstream/0.6'
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=pysam.git;a=commitdiff_plain;h=36e29386e0547c68f3468c92781c67cf5e180903

Merge commit 'upstream/0.6'

Delete files generated by cython.

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

36e29386e0547c68f3468c92781c67cf5e180903