Merge "Move clustering functionality of HistoryAdapter to its own class." into eclair-mr2