Merge branch 'and-labels'
authorRich Lane <rlane@club.cc.cmu.edu>
Mon, 17 Jan 2011 05:57:10 +0000 (21:57 -0800)
committerRich Lane <rlane@club.cc.cmu.edu>
Mon, 17 Jan 2011 05:57:10 +0000 (21:57 -0800)
commitb14438701562e6d93e4e903237d6757b9f42bbab
tree4b283bbb525c1ee64e16934d50ae6e986411be41
parentcbc12534de6f587b4cc04486202b8782b3fe5144
parent7a67a9bb9211bce393b16e20274cb6359b70254d
Merge branch 'and-labels'
lib/sup/index.rb