7efedc6a7dcc85b97d2c848a55ec535dbc8f728a 3029267cae50df863ffc273bfe3e44c3e297ec29 John Barton (joho) jrbarton@gmail.com http://github.com/joho/absurd-time-extensions/commit/fde05d981bef64ba70df7b01b7234f298f510326 fde05d981bef64ba70df7b01b7234f298f510326 2008-06-30T21:03:20-07:00 2008-06-30T21:03:20-07:00 Merge commit 'justinfrench/master' Conflicts: time_ext.rb 75547db9c7d0d6ac7c810363e6b7b337f7e7be0f John Barton (joho) jrbarton@gmail.com