tree 95157165770b15a12f4804b9c546ccf4a72c2fc2
parent 3f725308e16f92381ec06f861643997b5b970453
parent b632ba5f51c3ba9f510a3a3bd5ff96124b64070f
author Anand Doshi <anand@erpnext.com> 1363958027 +0530
committer Anand Doshi <anand@erpnext.com> 1363958027 +0530

Merge branch 'master' into edge

Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py