tree 4e8b20828384168c59c7e916727ea9d0eed23234
parent 83302dfe63e98d740de1487396f94bdd8e37b8fc
parent 3801804a8a8a36e95bb731467bcb6319b454f660
author Anand Doshi <anand@iwebnotes.com> 1328770395 +0530
committer Anand Doshi <anand@iwebnotes.com> 1328770395 +0530

Merge branch 'stable' into latest

Conflicts:
	erpnext/home/page/event_updates/event_updates.js