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
Bryan O'Sullivan	9db949eec3	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge ... dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers	2008-06-02 21:14:31 +00:00