Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 0 insertions, 15 deletions

diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
index 1de2f98cd..d609ccd25 100644
--- a/view/theme/redbasic/schema/boxy.php
+++ b/view/theme/redbasic/schema/boxy.php
@@ -1,19 +1,4 @@
 <?php
 
-if (!$comment_padding)
-	$comment_padding="42px";
-	
-if (!$comment_border_left)
-	$comment_border_left="1px solid";	
-
-if (!$comment_border_right)
-	$comment_border_right="1px solid";	
-
-if (!$comment_border_top)
-	$comment_border_top="1px solid";		
-
-if (!$comment_border_bottom)
-	$comment_border_bottom="1px solid";
 if (! $radiuspx)
 	$radiuspx = "4";
-	
\ No newline at end of file