diff core/image.py @ 880:bab6b1eac1e2

Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Sat, 03 Jan 2015 19:19:03 -0600
parents 36d988b800c2
children 24fc302f9076
line wrap: on
line diff