From: Sam Hartman <hartmans@debian.org>
Date: Mon, 23 Jun 2014 16:08:58 +0000 (-0400)
Subject: Update ui to fix merge conflict
X-Git-Tag: v0.9.6~62
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=cf46e77f28faa0489cfbf90acaf2dc3980d0447d

Update ui to fix merge conflict
---

diff --git a/ui b/ui
index ea9e814..8615288 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit ea9e814dc5d1c142d006f60c575a0261f247e2b8
+Subproject commit 8615288ad1f321195dbc3e063bfb6f295fa28cd2