On Sat, 2013-12-14 at 06:17 -0800, Dylan Baker wrote:
> What sha does this apply against? It doesn't apply against master, 2.0.14, or 
> 2.0.13?
> 

It likely doesn't apply to current master as numerous other rebase
errors have already been pointed out.  This was the attempt to rebase a
series of patches, many a year old now onto the current master which has
had numerous conflicting commits.  Plus numerous rebases for commit
merges, splits, and re-ordering in an attempt appease previous patch
reviews.