Merge with stable

.hgsigs

.hgtags

contrib/genosxversion.py

contrib/hgweb.fcgi

contrib/hgweb.wsgi

hgdemandimport/__init__.py

hgext/strip.py

hgweb.cgi

mercurial/dagop.py

mercurial/error.py

mercurial/logcmdutil.py

mercurial/repoview.py

tests/test-demandimport.py

tests/test-log.t

tests/test-obsolete.t

tests/test-rebase-check-restore.t

tests/test-rebase-obsolete.t

tests/test-strip.t