diff core/services.py @ 869:63209e53f3aa

Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Mon, 15 Dec 2014 19:51:28 -0600
parents ee87ea74d46b
children a423e8fd082d
line wrap: on
line diff