Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn

1 files changed, 4 insertions, 0 deletions

diff --git a/doc/style.css b/doc/style.css
index bf000dae1..8dd3b1c15 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -91,6 +91,10 @@ nav {
 	text-align: center;
 }
 
+img.img {
+	margin: 0.5ex;
+}
+
 .align-left {
 	float:left;
 }