# HG changeset patch # User Matt Mackall # Date 1368575572 18000 # Node ID 0fbcabe523bcaa68ee3f91bddfef0af6815a2016 # Parent 9311cd5c09ed4d686ded5cb5180ce244b425b4a2# Parent 278057693a1ddb93f95fa641e30e7a966ac98434 merge with stable diff -r 9311cd5c09ed -r 0fbcabe523bc .hgsigs --- a/.hgsigs Tue May 14 15:16:44 2013 -0700 +++ b/.hgsigs Tue May 14 18:52:52 2013 -0500 @@ -71,3 +71,4 @@ 8a7bd2dccd44ed571afe7424cd7f95594f27c092 0 iD8DBQBRXfBvywK+sNU5EO8RAn+LAKCsMmflbuXjYRxlzFwId5ptm8TZcwCdGkyLbZcASBOkzQUm/WW1qfknJHU= 292cd385856d98bacb2c3086f8897bc660c2beea 0 iD8DBQBRcM0BywK+sNU5EO8RAjp4AKCJBykQbvXhKuvLSMxKx3a2TBiXcACfbr/kLg5GlZTF/XDPmY+PyHgI/GM= 23f785b38af38d2fca6b8f3db56b8007a84cd73a 0 iD8DBQBRgZwNywK+sNU5EO8RAmO4AJ4u2ILGuimRP6MJgE2t65LZ5dAdkACgiENEstIdrlFC80p+sWKD81kKIYI= +ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 0 iD8DBQBRkswvywK+sNU5EO8RAiYYAJsHTHyHbJeAgmGvBTmDrfcKu4doUgCeLm7eGBjx7yAPUvEtxef8rAkQmXI= diff -r 9311cd5c09ed -r 0fbcabe523bc .hgtags --- a/.hgtags Tue May 14 15:16:44 2013 -0700 +++ b/.hgtags Tue May 14 18:52:52 2013 -0500 @@ -84,3 +84,4 @@ 8a7bd2dccd44ed571afe7424cd7f95594f27c092 2.5.4 292cd385856d98bacb2c3086f8897bc660c2beea 2.6-rc 23f785b38af38d2fca6b8f3db56b8007a84cd73a 2.6 +ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 2.6.1