svn merge -r108243:108266 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
svn merge -r108243:108266 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

no conflicts

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm