# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1415209894 18000
# Node ID bc3d0e4964241eeba9b1f4ccb7e1a77a486e2fcb
# Parent  d07ccad28b1a8f8fdef4144812e1b9af75ac7f6b# Parent  ee4d0f91eaf98b56eddcfa04b616de939148f02b
Merge stable back into default.

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -13,3 +13,4 @@ 7d47a0f731354505ed9ae8d60d2a6996e8c3294f
 8caf1226adecb322e90ddb3817c604fa2fe8a66d 1.6.1
 36f6d51b4edc31f1f9ce2d0d02965a85dd26a455 1.6.2
 46523cdfd3b0cee0bf1366ab587686bb65211747 1.6.3
+139a44a63090b2c0f8e05d7d1104d3d9c9e26f57 1.7