Merge remote-tracking branch 'opf/feature/rails3' into feature/timelines-render-bucket-size

Conflicts:
	doc/CHANGELOG.md
pull/649/head
Martin Czuchra 11 years ago
commit 1fcedd8f78

Diff Content Not Available