# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1512904347 0
# Node ID 01e938b89e7c693c1f4d03f0622b73fa8da4f5d4
# Parent  6d16cf5a30ddb9132b924facde1aa5dec2afd289# Parent  e541bd511187356902bf5083542fa62ddd065f71
Merge with upstream.

diff -r 6d16cf5a30dd -r 01e938b89e7c .hgtags
--- a/.hgtags	Sat Dec 09 18:19:48 2017 +0000
+++ b/.hgtags	Sun Dec 10 11:12:27 2017 +0000
@@ -123,3 +123,4 @@
 7d975b619963ec3d2e394cf11b393aadaed40518 build-default-288
 37a436edfedd640b37362a4c9aeb59e101aeb90b build-default-289
 33b4d07c59071d318f19f9d7993719ac0c4ca9e5 build-default-290
+d6f1f2b3bd017d58eca8d47366ed1542bd735c3f build-default-292