Merge branch 'master' of ssh://www.unl.edu/cwis/data/ucomm

.htaccess

@@ -2,6 +2,8 @@ AddType 'text/html; charset=UTF-8' shtml
 RewriteEngine On
 RewriteOptions inherit
 RewriteRule ^news/$    http://newsroom.unl.edu/         [R=301]
+RewriteRule ^lincoln$    http://www.unl.edu/lincoln/         [R=301]
+RewriteRule ^lincoln/$    http://www.unl.edu/lincoln/         [R=301]
 RewriteRule ^international/$    http://international.unl.edu/         [R=301]
 RewriteRule ^foodfuelwaterphotocontest/$    http://innovate.unl.edu/photocontest/        [R=301]
 RewriteRule ^unltoday/$   http://news.unl.edu/newsrooms/unltoday/       [R=301]

.htaccess.root

@@ -19,6 +19,7 @@ RewriteCond %{REMOTE_HOST} ^216\.128\.(20[8-9]|21[0-9]|22[0-3])\.
 RewriteRule .* - [E=UNL_CAMPUS:on]
 
 RewriteCond %{ENV:UNL_CAMPUS} on
+RewriteCond %{HTTP_HOST} ^www.unl.edu$
 RewriteCond %{REQUEST_URI} ^/$ [OR]
 RewriteCond %{REQUEST_URI} ^/index.shtml$ 
 RewriteRule (.*) http://news.unl.edu/newsrooms/unltoday/ [R=302,L]