tree 199453b08fe0b5c4a34d90c3574577629a7fc69d
parent 96333b6bc77e137130d8af6501b0c518d333403a
parent fe44d27d7f29cf6a9c16f553af05fa079a949a87
author Pratik Vyas <m@pd.io> 1382690268 +0530
committer Pratik Vyas <m@pd.io> 1382690268 +0530

Merge remote-tracking branch 'upstream/wsgi' into HEAD

Conflicts:
	public/js/complete_setup.js
	setup/doctype/setup_control/setup_control.py