Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk. ... svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv.		2008-12-04 22:36:34 +00:00
..
message_template.msg	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00