* New upstream release.
- History shown in Empathy chat window should be different
from new messages (LP: #531811)
- In chat rooms, empathy should not scroll to the bottom whenever
a new message is received. (LP: #542806)
- Merged patch from Omer Akram, we shouldn't hard code font
sizes (LP: #531835)