Merge branch 'gem'
commit2b02e5d0aef42e90ccaf768c26a88dd322e12a15
authorTom Preston-Werner <tom@mojombo.com>
Tue, 26 Jun 2007 04:08:28 +0000 (25 21:08 -0700)
committerTom Preston-Werner <tom@mojombo.com>
Tue, 26 Jun 2007 04:08:28 +0000 (25 21:08 -0700)
tree9eb10fb3db80f248cff5b9db9ad2130d3e4e2c06
parent4d4d4b7b348d2455f799ed691e403ea5d55a010b
parent5bb9ee7de8f8cd245d19a98d8b10ff7424334c8a
Merge branch 'gem'