sebbacon/alaveteli — pull request #297 by jpmckinney (2011-11-29 02:13:43+00:00)
Title: Switch to Bundler

See #272 for details. Note that it incorrectly includes my flexible_binary_paths_dev branch (which has been merged and therefore should not cause conflicts). There may be a conflict regarding the require'ing of tmail.