# HG changeset patch
# User Jon Chatten
# Date 1270639564 -3600
# Node ID f9d258cee458dd80f1bc0aee9c0a7de5d2d1c884
# Parent  48d025ecec3c84879fa2fbea5a5b67a9390fb329# Parent  d8edd94cd8e2f311f32f216c07639e63a2351ec1
merge 2.13.0 (candidate 2) from default