tree 5561e411b369af54ced40fc7c21b4094ed50ce6a
parent 0f21b324c9c7cf8288e14d2b50a2a7cae3e6d3a5
parent 690c2f5ffe6a82a88b24982b04d3d054a35bf7ea
author Anand Doshi <anand@erpnext.com> 1373264860 +0530
committer Anand Doshi <anand@erpnext.com> 1373264860 +0530

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

Conflicts:
	patches/patch_list.py