# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1406849618 25200
# Node ID 175c7d68f3c428733551d7b76da99bd3b8b8d822
# Parent  ce2f4e39770384cc35f2f2d363110a41036c4543# Parent  529883a3a11450bf3171e754fe0ca0c845518d57
merge ganymed into mainline