Signed-off-by: Luke Yelavich <themuso@ubuntu.com>

Conflicts:
	tests/pyatspi/testrunner

This reverts commit 6566f780.

This shouldn't have been imported into the dfsg branch

This will be null-merged into the ubuntu branch

Conflicts:
	debian/changelog

Merge tag 'upstream/2.6.0' into upstream-dfsg

Upstream version 2.6.0

debian/patches/fix-print-usage: in examples/magFocusTracker.py: use print('...') - it's supposed to be python3. (LP: #1052331)

Merge tag 'upstream/2.5.92' into upstream-dfsg

Upstream version 2.5.92

Conflicts:
	tests/Makefile.in
	tests/apps/Makefile.in
	tests/data/Makefile.in
	tests/dummyatk/Makefile.in
	tests/pyatspi/Makefile.in
	tests/pyatspi/pasytest/Makefile.in

Conflicts:
	tests/pyatspi/testrunner