Merge branch 'testing'

Conflicts:
	css/default.css

diff --cc css/default.css
index 6ac67db,280e51e..7309249
--- 1/css/default.css
--- 2/css/default.css
+++ b/css/default.css
@@@ -35,7 -35,7 +35,7 @@@ a:hover 
  }
  
  p, ul, ol {
--      line-height: 1.6;
++      line-height: 1.68;
  }
  
  pre {
@@@ -140,14 -144,14 +144,14 @@@ span.imgleft 
        display: inline-block;
        float: left;
        margin-right: 10px;
--      margin-top: 5px;
++      margin-top: 9px;
  }
  
  span.imgright {
        display: inline-block;
        float: right;
        margin-left: 10px;
--      margin-top: 5px;
++      margin-top: 11px;
  }
  
  img.thumb {

diff --cc templates/default.html
Simple merge