mleinart/carbon — pull request #2 by rowanu (2012-12-12 21:42:05+00:00)
Title: Update lib/carbon/filter.py

I'm guessing the "<<<<<<< HEAD" shouldn't be there.