commit 9e59aff54e4377ca63de676baaaa1a2791acb4fa
author Anand Doshi <anand@erpnext.com> Mon Aug 12 20:00:33 2013 +0530
committer Anand Doshi <anand@erpnext.com> Mon Aug 12 20:00:33 2013 +0530
tree f88eb8d741b2858344b121c7b903e901e16c0980
parent 8441a631219be2acceabe419c28ad96ce96751df
parent 44b2e23eba328476034c6ac50db613be3e611208

Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master

Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py

patches/patch_list.py

diff --git a/patches/patch_list.py b/patches/patch_list.py
index 95b10b7..bd6b9a3 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -253,4 +253,5 @@
 	"execute:webnotes.bean('Selling Settings').save() #2013-07-29",
 	"patches.august_2013.p01_hr_settings",
 	"patches.august_2013.p02_rename_price_list",
+	"patches.august_2013.p03_pos_setting_replace_customer_account",
 ]
\ No newline at end of file