tree 60e6ba97f343b1fa547a686d61e1482957d19ba5
parent cd6dcacc6e641bafaa41a485ba384c0939221114
parent 2ef637b346a37b7ae6a6ddef63ebce72f31599d0
author Anand Doshi <anand@erpnext.com> 1371797572 +0530
committer Anand Doshi <anand@erpnext.com> 1371797572 +0530

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

Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js