Manually imported Debian patch 1.1.1-2
Merge commit 'upstream/1.2'
Manually imported Debian patch 1.2-3
Manually imported Debian patch 1.2-6
Merge commit 'upstream/1.3'

Conflicts:
	Makefile

Manually resolved incorporating the Debian adjustments.
Manually imported Debian patch 1.3-0.1
Imported Debian patch 1.3-2
Merge branch 'upstream'

Conflicts:
	Makefile

Manually resolved incorporating the Debian adjustments.
Imported Debian patch 1.4b2-0.2.1
Merge branch 'upstream'

Conflicts:
	tree.c
Imported Debian patch 1.4b3-1
Imported Debian patch 1.4b3-2
Merge branch 'upstream'

Conflicts:
	tree.c
Imported Debian patch 1.5.0-1
Imported Debian patch 1.5.0-2
Merge branch 'upstream'
Imported Debian patch 1.5.1-1
Imported Debian patch 1.5.1-2
Merge branch 'upstream'
Imported Debian patch 1.5.1.1-1