Merge branch 'stable'

Conflicts:
	src/qt-1-cherrypicks.patch
pull/81/merge
Mark Brand 12 years ago
commit a9602274b7

Diff Content Not Available