modified:   Scrapy/middlewares.py
Merge branch 'master' of github.com:yanpeipan/Scrapy

* 'master' of github.com:yanpeipan/Scrapy:
  php
  deleted:    Scrapy/Books 	deleted:    Scrapy/Resources 	deleted:    Scrapy/spiders/dmoz_spider.py 	deleted:    Scrapy/spiders/dmoz_spider.pyc
  proxy

Conflicts:
	Scrapy/middlewares.py

	deleted:    Scrapy/Books
	deleted:    Scrapy/Resources
	modified:   Scrapy/__init__.pyc
	modified:   Scrapy/items.pyc
	modified:   Scrapy/middlewares.py
	modified:   Scrapy/middlewares.pyc
	modified:   Scrapy/pipelines.py
	modified:   Scrapy/pipelines.pyc
	modified:   Scrapy/settings.pyc
	modified:   Scrapy/spiders/__init__.pyc
	deleted:    Scrapy/spiders/dmoz_spider.py
	deleted:    Scrapy/spiders/dmoz_spider.pyc
	modified:   Scrapy/spiders/douban.py
	modified:   Scrapy/spiders/douban.pyc
	new file:   Scrapy/spiders/proxy.py
	new file:   Scrapy/spiders/proxy.pyc