astropy/astropy — pull request #2368 by embray (2014-04-24 21:08:13+00:00)
Title: Merge branch '3.2-stable' into astropy

Incorporates up through aa78ac3ad54441cf247e8f32ef32dd685a05c6fc