m app/controllers/application_controller.rb
m app/models/incoming_message.rb
m config/alert-tracks-debian.ugly
m config/boot.rb
m config/crontab.ugly
m config/environment.rb
m public/stylesheets/ie6-custom.css
m script/runner
m vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
Merge branch 'master' of github.com:sebbacon/alaveteli