Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch_list.py
diff --git a/patches/patch_list.py b/patches/patch_list.py
index be87d44..c0f53b3 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -170,5 +170,6 @@
"execute:webnotes.conn.sql_ddl('alter table tabSeries change `name` `name` varchar(100)')",
"execute:webnotes.conn.sql('update tabUserRole set parentfield=\"user_roles\" where parentfield=\"userroles\"')",
"patches.february_2013.fix_outstanding",
+ "patches.february_2013.p01_event",
"execute:webnotes.delete_doc('Page', 'Calendar')"
]
\ No newline at end of file