From d421b4a5563719ed9bebf7c9fbc5e0a6f074ff32 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Tue, 6 Apr 2010 19:50:25 +0200
Subject: Styling bugfixes

---
 etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs | 2 +-
 etherpad/src/templates/admin/pluginmanager.ejs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs b/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
index d5d09c3..1f33eb8 100644
--- a/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
+++ b/etherpad/src/plugins/twitterStyleTags/templates/tagBrowser.ejs
@@ -54,7 +54,7 @@ limitations under the License. */ %>
 
 <div id="padpage">
  <div id="padtop">
-  <div id="topbar" style="margin: 7px; margin-top: 0px;">
+  <div id="topbar">
    <div id="topbarleft"><!-- --></div>
    <div id="topbarright"><!-- --></div>
    <div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>
diff --git a/etherpad/src/templates/admin/pluginmanager.ejs b/etherpad/src/templates/admin/pluginmanager.ejs
index 1cd7139..077d10a 100644
--- a/etherpad/src/templates/admin/pluginmanager.ejs
+++ b/etherpad/src/templates/admin/pluginmanager.ejs
@@ -53,7 +53,7 @@ limitations under the License. */ %>
 
 <div id="padpage">
  <div id="padtop">
-  <div id="topbar" style="margin: 7px; margin-top: 0px;">
+  <div id="topbar">
    <div id="topbarleft"><!-- --></div>
    <div id="topbarright"><!-- --></div>
    <div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>
-- 
cgit v1.2.3-1-g7c22


From d84d8b6bd3e6443c5d78b761d1585eaec24f77e7 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Wed, 7 Apr 2010 22:18:42 +0200
Subject: Fixing commit of local-config

---
 etherpad/etc/etherpad.localdev-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
index c540d12..1143178 100644
--- a/etherpad/etc/etherpad.localdev-default.properties
+++ b/etherpad/etc/etherpad.localdev-default.properties
@@ -16,4 +16,4 @@ transportPrefix = /comet
 transportUseWildcardSubdomains = true
 useVirtualFileRoot = ./src
 motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
-topdomains = localhost,redhog.org
+topdomains = localhost
-- 
cgit v1.2.3-1-g7c22