Merge branch 'master' of github.com:webnotes/erpnext into responsive

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-07-08 11:57:40 +05:30