[Magellancms-cvs] magellan/www/admin magellanprefs.php,1.3,1.4

[<bur...@us...>]

Update of /cvsroot/magellancms/magellan/www/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv7204/www/admin

Added Files:
	magellanprefs.php 
Log Message:
Solved conflicts.