From 0cf6b1f118ac71b96d2f49ae3681a65b8e5d2092 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Tue, 19 Apr 2016 09:48:27 -0700
Subject: [PATCH] merge ATOS changes from hurricane

---
 groundtest | 2 +-
 junctions  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/groundtest b/groundtest
index b2fb2cd9..88de2b8e 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit b2fb2cd969619433a2c67ee6dad6c4b84206ee14
+Subproject commit 88de2b8e0a8b5e6e0e672cccdf1ddc25c6698374
diff --git a/junctions b/junctions
index 4c2d3749..69ba87c2 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit 4c2d3749a742f4a6389cdedfd51da4a3cfa00f76
+Subproject commit 69ba87c285c285118df34ae58bc50dd7152ec3d2