Merge branch '0.9.x' into openidplugin

Conflicts:
	actions/login.php
	actions/register.php

3 files changed, 5 insertions, 15 deletions

diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css
index 6c6dfb503..b35f332aa 100644
--- a/theme/base/css/jquery.Jcrop.css
+++ b/theme/base/css/jquery.Jcrop.css
@@ -1,18 +1,11 @@
 /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
-.jcrop-holder
-{
-	text-align: left;
-}
+.jcrop-holder { text-align: left; }
 
 .jcrop-vline, .jcrop-hline
 {
 	font-size: 0;
 	position: absolute;
-	background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat;
-	/*
-	opacity: .5;
-	*filter:alpha(opacity=50);
-	*/
+	background: white url(../images/illustrations/illu_jcrop.gif) top left repeat;
 }
 .jcrop-vline { height: 100%; width: 1px !important; }
 .jcrop-hline { width: 100%; height: 1px !important; }
@@ -22,14 +15,11 @@
 	height: 7px !important;
 	border: 1px #eee solid;
 	background-color: #333;
-	/*width: 9px;
-	height: 9px;*/
+	*width: 9px;
+	*height: 9px;
 }
 
-.jcrop-tracker {
-	/*background-color: gray;*/
-	width: 100%; height: 100%;
-}
+.jcrop-tracker { width: 100%; height: 100%; }
 
 .custom .jcrop-vline,
 .custom .jcrop-hline
diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png
index 6a001f11a..de63f1577 100644
--- a/theme/base/images/icons/icon_atom.png
+++ b/theme/base/images/icons/icon_atom.png
diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png
index 0ccd1ce25..e75778a9e 100644
--- a/theme/base/images/icons/icon_rss.png
+++ b/theme/base/images/icons/icon_rss.png