From: P. F. Chimento <philip.chimento@gmail.com>
Date: Sun, 30 Jan 2011 15:41:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:wmvanvliet/Chimara
X-Git-Tag: v0.9~153
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=bf5bc4b0d129685482eefea499f39f874744e2fd;p=projects%2Fchimara%2Fchimara.git

Merge branch 'master' of github.com:wmvanvliet/Chimara

Conflicts:
	player/style.css
---

bf5bc4b0d129685482eefea499f39f874744e2fd
diff --cc player/style.css
index 7a37d70,023e0aa..9788fd3
--- a/player/style.css
+++ b/player/style.css
@@@ -38,8 -41,13 +40,12 @@@ grid.user1 
  	background-color: #ffffff;
  }
  
+ buffer.emphasized {
+ 	font-size: 14;
+ }
+ 
  buffer.header {
  	font-weight: bold;
 -	text-align: center;
  }
  
  buffer.subheader {