ignore-dead-branch

Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165

merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456

dataserver-is-deprecated

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.

* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269

svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.

corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762