565,569,566,584
Merge branch 'master' of https://github.com/kdeorg/bestalloc

Conflicts:
	src/bestalloc.pro
	src/ui/GraphWidget.cpp