tree af5ab51ce6fe139e2cca1ec3cca2dcc0a532f3f9
parent b5bc54dd0041df05911b3b327bdb40a7bc1b29ca
parent 26814e7bad2de54858c067c3d94e648df9c6cf69
author Anand Doshi <anand@iwebnotes.com> 1326963663 +0530
committer Anand Doshi <anand@iwebnotes.com> 1326963663 +0530

Merge branch 'master' into latest

Conflicts:
	erpnext/patches/patch_list.py