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

Conflicts:
	erpnext/patches/patch_list.py

erpnext/patches/july_2012/remove_event_role_owner_match.py

@@ -0,0 +1,5 @@
+def execute():
+	import webnotes
+	webnotes.conn.sql("""\
+		update `tabDocPerm` set `match`=NULL
+		where parent='Event' and role='All' and permlevel=0""")

erpnext/patches/patch_list.py

@@ -500,4 +500,9 @@ patch_list = [
 		'patch_file': 'auth_table',
 		'description': 'create new __Auth table'
 	},
+	{
+		'patch_module': 'patches.july_2012',
+		'patch_file': 'remove_event_role_owner_match',
+		'description': "Remove Owner match from Event DocType's Permissions"
+	},
 ]