2 Commits (c19c7d7d3bd2b36e4e7a50d64e38a97a676b0e80)

Author	SHA1	Message	Date
Aaron Brashears	e3cf284388	Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165	2009-01-08 00:05:06 +00:00
Kelly Washington	dc48f1c741	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release ... HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448	2008-04-03 22:50:22 +00:00