Merge branch 'master' of github.com:webnotes/wnframework into handlerupdate

py/webnotes/boot.py

@@ -41,7 +41,7 @@ def get_bootinfo():
 
 	# remove email settings from control panel dict
 	for field in ['mail_login', 'mail_password', 'mail_port', 'outgoing_mail_server', 'use_ssl']:
-		del cp[field]
+		if field in cp: del cp[field]
 	
 	# system info
 	bootinfo['control_panel'] = cp.copy()

py/webnotes/widgets/form/assign_to.py

@@ -110,7 +110,7 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', no
 		arg = {
 			'uid': owner,
 			'comment': "A new task, %s, has been assigned to you by %s." \
-				% (assignment, webnotes.session.get('uer')),
+				% (assignment, webnotes.session.get('user')),
 			'notify': notify
 		}
 	from home.page.my_company import my_company