tornado branch becomes a trunk
.
Merge branch 'limit-requests-count'
Merge commit 'origin/working-http-timeouts'
Merge branch 'master' of http://github.com/haxo/frontik
Merge branch 'retry-count'
Merge remote branch 'haxo/master'
Merge branch '0.19.7'

Conflicts:
	debian/changelog
Merge branch 'master' into debug-mode

Conflicts:
	debian/control
	src/frontik/app.py
	src/frontik/handler.py
Version 0.20.6
Merge remote branch 'haxo/master'

Conflicts:
	debian/changelog
	src/frontik/handler.py
Merge branch 'master' into debug-mode

Conflicts:
	src/frontik/handler.py
Merge remote branch 'haxo/master'
Introduce util.asciify_url
Merge commit 'upstream/master'
Merge branch '0.20.6'

Conflicts:
	debian/changelog
	src/frontik/app.py
Merge branch 'debug-mode'
merge 'dborovikov/fuchakubutsu'
Merge commit 'haxo/master'

Conflicts:
	debian/changelog
	src/frontik/handler.py
Merge remote branch 'dborovikov/fuchakubutsu'
merged 0.20.6fix4
merge 0.20.6fix5