Merge branch 'sup-cmd'
authorRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:19:18 +0000 (13:19 -0800)
committerRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:19:18 +0000 (13:19 -0800)
commit6ec54c4301a2545d607198e68a0c13e3720760a7
treed447265702998ca8b2707644f829dfb457cd2a20
parent1e1256182f8c9d3be51903b3db956bc19d1a04ed
parent8440740a7b84ee3cf1d2bdbaf9e1eb10c6be6b5c
Merge branch 'sup-cmd'

Conflicts:
lib/sup.rb
lib/sup.rb