From 6acba1325e23bfc1e362d64744feb4c0c9249ff2 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Tue, 27 May 2014 11:18:13 +0200
Subject: [PATCH 1/2] Prepare for 0.18.1 release.

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f8a4a88..f8d40914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spreed-webrtc-server (0.18.1) precise; urgency=low
+
+  * Added autoconf/automake support.
+  * Build SCSS compressed in release mode. 
+
+ -- Simon Eisenmann <simon@struktur.de>  Tue, 27 May 2014 11:16:22 +0200
+
 spreed-webrtc-server (0.18.0) precise; urgency=low
 
   * The project is now named Spreed WebRTC. All reference to the old

From d51e29165786f1e0dc5dc8458f59c8e96e349519 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Sun, 25 May 2014 20:41:39 +0200
Subject: [PATCH 2/2] Fixed issue with overlapping text and timestamp.

---
 src/styles/components/_chat.scss            | 5 +++++
 static/js/controllers/chatroomcontroller.js | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index 4c52a439..4da09c0b 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -297,6 +297,11 @@
     text-align: right;
     top: 8px;
   }
+  .timestamp-space {
+    width:40px;
+    height:10px;
+    float:right;
+  }
   strong {
     display: block;
     padding-bottom: 2px;
diff --git a/static/js/controllers/chatroomcontroller.js b/static/js/controllers/chatroomcontroller.js
index 958bff6d..74c66656 100644
--- a/static/js/controllers/chatroomcontroller.js
+++ b/static/js/controllers/chatroomcontroller.js
@@ -192,7 +192,9 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
 				}
 				lastMessageContainer = $("<ul>").appendTo(container);
 				if ($.trim(s)) {
-					element = $("<li>").html(s).appendTo(lastMessageContainer);
+					element = $("<li>").html(s);
+					element.prepend('<div class="timestamp-space">');
+					element.appendTo(lastMessageContainer);
 				}
 			}
 			if (nodes) {