These go to eleven...
Changelog
Merge remote-tracking branch 'opf/feature/rails3' into feature/timelines-render-bucket-size

Conflicts:
	doc/CHANGELOG.md
Merge remote-tracking branch 'opf/feature/rails3' into feature/timelines-render-bucket-size

Conflicts:
	doc/CHANGELOG.md
Merge pull request #649 from opf/feature/timelines-render-bucket-size