tree d9dd4e1473650c418b124c4d92ba3ebf0c7c9454
parent 6be842f9606c25495b311c172048ce06c19641cb
parent 46848a48fe3478fa1a1101650189eb894812108c
author Anand Doshi <anand@iwebnotes.com> 1327492274 +0530
committer Anand Doshi <anand@iwebnotes.com> 1327492274 +0530

Merge branch 'master' into latest

Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num