astropy/astropy — pull request #2006 by astrofrog (2014-01-28 13:22:53+00:00)
Title: Update bundled six to 1.5.2

I originally included this as part of #1907 but saw some strange errors due to this so splitting it out instead.