Merge branch 'restore-state'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:36:29 +0000 (15:36 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:36:29 +0000 (15:36 -0400)
commit5a5e955182c1a53279bd0d62647e4c12dfebc66e
tree687b899039b11f6d05e645373968399c52d2202d
parentbc9851870f116b066b6e53c55e1cd5bac6f20d5d
parent4eb5cf1f7a7087463f2898c2c94fbcbb87242e75
Merge branch 'restore-state'

Conflicts:
bin/sup-sync