Fix warning on automake-1.12.4
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
P2P IP filter

Signed-off-by: Piotrek <pepe@attika.ath.cx>
m4 execinfo

Signed-off-by: Piotrek <pepe@attika.ath.cx>
increase shutdown timeout

Signed-off-by: Piotrek <pepe@attika.ath.cx>
debian dir

Signed-off-by: Piotrek <pepe@attika.ath.cx>
canvas fix

Signed-off-by: Piotrek <pepe@attika.ath.cx>
colour patch

Signed-off-by: Piotrek <pepe@attika.ath.cx>
inverse bar instead of * for navigating through lists

Signed-off-by: Piotrek <pepe@attika.ath.cx>
more readable indent of status info

Signed-off-by: Piotrek <pepe@attika.ath.cx>
GeoIP support

Signed-off-by: Piotrek <pepe@attika.ath.cx>
Merge branch 'automake-1.12' of git://github.com/skydrome/rtorrent

Conflicts:
	src/Makefile.am