# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1505673752 -3600
# Node ID db0d667f98d5391004dec370e8478954bd120ed5
# Parent  e9e58ef29d590dec58faaf7b333db75f449f0fef# Parent  bdeb4807d83965675a797d7808f38778d1108566
Merge with upstream.

diff -r e9e58ef29d59 -r db0d667f98d5 .hgtags
--- a/.hgtags	Sun Sep 17 19:42:08 2017 +0100
+++ b/.hgtags	Sun Sep 17 19:42:32 2017 +0100
@@ -105,3 +105,4 @@
 dff7d9fb81b3aa3aeed1791a857e2bc28fe6141a build-default-270
 411557b5fd5253f091ccd379a8d1492cf15ecc08 build-default-271
 0e0cbc22a87f9a2a409f649da7abef63d0850150 build-default-272
+7c62a16ed76ce39677f204a68371f748927acb6d build-default-273