tree 0d5f12394f11b252e27a7a8c279c44cd2026d433
parent e868db33ab334952f9eff3f18b83ef100f94063c
parent 0c42dc4c220f6c8043c63df411788421fe130484
author Anand Doshi <anand@erpnext.com> 1358150311 +0530
committer Anand Doshi <anand@erpnext.com> 1358150311 +0530

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

Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt