From 60fcf600f5010701c20b63867999a802ca0e05c0 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 13 Jul 2010 19:55:47 +0000
Subject: Merge branch 'stable'

---
(limited to 'html.c')

--
cgit v0.9.0.2