# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2013-10-01 17:44:59
# Node ID 5c0dc243fe5b921589688633a6d2fbe4756d5d1c
# Parent  b00ba31313c39b38a6e724c1162787ed75fa66a5
# Parent  1aaefba2a3a9dc8b37d29b9c437876407e87c16f

merge with stable