tree fbaaa5c2bdfa6aa2bc07d3cd3ff133ec6dd31865
parent a2a1ec765b535a1ed1b2edc3e535c19b99540e6f
parent 70eda07bcfe58769f55220e4dbdbeffbb66a0861
author Anand Doshi <anand@erpnext.com> 1373264615 +0530
committer Anand Doshi <anand@erpnext.com> 1373264615 +0530

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

Conflicts:
	patches/patch_list.py