Merge branch 'master' of https://github.com/underhilllabs/scuttle
authorBenjamin Mako Hill <mako@atdot.cc>
Sun, 8 Apr 2012 19:42:04 +0000 (15:42 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Sun, 8 Apr 2012 19:42:04 +0000 (15:42 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?