Merge fixes.

This commit is contained in:
Ren Erthilo
2012-04-22 02:54:18 +01:00
parent 7e13ad12cb
commit 8a346f7a59
2 changed files with 16 additions and 2 deletions
@@ -214,8 +214,6 @@
observer.real_name = observer.name
observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything!
preferences.copy_to_observer(observer)
del(src)
return 1