]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc98518 4eb5cf1)
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)
Conflicts:
bin/sup-sync


Trivial merge
Carl's lame hacks to sup (see http://sup.rubyforge.org/)