Merge with upstream
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with upstream
manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4
dtHuM/86dYZ6CRqQHohJVjk=
=v+Vv
-----END PGP SIGNATURE-----
include hg
recursive-include mercurial *.py
include tkmerge
include hgweb.cgi
include hgeditor rewrite-log convert-repo
include tests/README tests/run-tests tests/test-*[a-z] tests/*.out
include *.txt
include templates/map templates/map-*[a-z]
include templates/*.tmpl
include doc/README doc/*.txt
include contrib/* contrib/git-vis/*
include README