From: luke.segars <lukes@eecs.berkeley.edu>
Date: Fri, 8 Oct 2010 07:59:58 +0000 (-0700)
Subject: Merge branch 'master' of http://zarvox.org/~zarvox/shareboard
X-Git-Url: http://git.zarvox.org/shortlog/%7Bthis.props.bicon_url%7D?a=commitdiff_plain;h=87d59c431f45e8ab739d6eb14283ae55fea3d09b;p=shareboard.git

Merge branch 'master' of http://zarvox.org/~zarvox/shareboard
---

87d59c431f45e8ab739d6eb14283ae55fea3d09b