--- deliantra/server/Changes	2008/05/14 08:31:33	1.161
+++ deliantra/server/Changes	2008/05/17 00:17:02	1.162
@@ -11,10 +11,16 @@
 TODO: rebalance jumping skill speed
 2.55
 TODO: 2008-05-10 00:29:43.0651 move_object: monster has been removed - will not process further
-	- (map) fixed npc dialogue in pup_land/s_f/special
+        - (arch) fix typo in ixalovh treasurelist causing empty_archetypes to appear.
+	- (map) fixed npc dialogue in pup_land/s_f/special.
+        - bugfix: fix a crash when a player casts a swarm spell and then logs out
+          (swarm spells now stay in the player's inventory).
 	- bugfix: when unapplying skills also remove them from the range/combat slots.
+        - bugfix: do not merge items whose archetype name merges, use the
+          archetype *archname* (chairs of different facings were merged).
+        - bugfix: fix a potential crash issue in find_object_name (not used
+          normally).
 	- update AnyEvent API to 3.4 and above.
-        - (arch) fix typo in ixalovh treasurelist causing emoty_archetypes to appear.
 
 2.54  Thu May  8 22:01:22 CEST 2008
 	- change floorbox item ordering to enable more efficient protocol and to