Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
This commit is contained in:
Shashi Gowda
2011-04-09 21:57:45 +05:30
206 changed files with 314 additions and 17667 deletions

View File

@@ -717,15 +717,10 @@ display:none;
#export_data li {
list-style-type:none;
display: inline;
line-height: 2;
line-height: 2.5;
}
#export_data li a {
padding-left: 20px;
margin-right: 10px;
}
#export_data li a.foaf {
padding-left: 30px;
}