tree 76fab6b29d7ee7ed6a4b1508a55d196de5762f63
parent ca4c8a2a46f9c73f7c84c17362c4c2520fb54450
parent c76e34d7de54303644a8e929439787202f2f23a6
author Anand Doshi <anand@erpnext.com> 1443613438 +0530
committer Anand Doshi <anand@erpnext.com> 1443613438 +0530

Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	erpnext/accounts/report/general_ledger/general_ledger.py