From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 8 Sep 2009 19:36:29 +0000 (-0400)
Subject: Merge branch 'restore-state'
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=5a5e955182c1a53279bd0d62647e4c12dfebc66e;p=sup

Merge branch 'restore-state'

Conflicts:
	bin/sup-sync
---

5a5e955182c1a53279bd0d62647e4c12dfebc66e