Matt Griffin f4123f4ae1 Merge branch 'master' of https://github.com/michaeldwan/foreman into feature/concurrency ...

Conflicts:
	spec/foreman/engine_spec.rb
	spec/foreman/export/bluepill_spec.rb
	spec/resources/export/bluepill/app.pill

2012-01-16 17:18:14 -05:00

..

export

Merge branch 'master' of https://github.com/michaeldwan/foreman into feature/concurrency

2012-01-16 17:18:14 -05:00