Merge branch 'master' of git@github.com:elliottcable/jello
commit068582d74636b0120b7d6f9887df78dc5567305f
authorelliottcable <git@elliottcable.name>
Thu, 25 Dec 2008 01:11:05 +0000 (24 16:11 -0900)
committerelliottcable <git@elliottcable.name>
Thu, 25 Dec 2008 01:28:30 +0000 (24 16:28 -0900)
tree102768fc252d7dbb7fbf48a204eb7738373c005e
parent15bb81985b0de20fda28ba7df5248c174459f454
parent523dcef3f18f5b2db81e447ad442f6d1bbe13c8d
Merge branch 'master' of git@github.com:elliottcable/jello
Rakefile.rb