tree 044efe17290114467d46df0d1e604e9430cb9320
parent 1b35b1aa62522a80edd3f2db2294b27a22149e7a
parent e33f827e32d1c076a5ee76a922f32d68fa687818
author Anand Doshi <anand@erpnext.com> 1365603466 +0530
committer Anand Doshi <anand@erpnext.com> 1365603466 +0530

Merge branch 'master' into edge

Conflicts:
	patches/patch_list.py