--- deliantra/server/Changes	2009/02/22 17:10:06	1.349
+++ deliantra/server/Changes	2009/03/02 22:25:18	1.350
@@ -29,6 +29,9 @@
 2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
 2009-01-23 07:55:29.4716 object refering to nonexistant archetype 'stonefloorred2'.
 
+	- aggressively merge spell effects and do not allow more than 5 spell
+          effects (w.r.t. put_more) per mapspace, to give the server a chance
+          to survive a hundred deathsheads.
         - correctly clear op->env when inserting onto map, this was a potentially
           disastrous bug of unfortunately unknown proportions...
         - fix cone-spell symmetry that was broken for direction 8.