From 4e75d7c9b93010663963d362099777b77a67c446 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 08 Dec 2009 18:34:30 +0000
Subject: Merge branch 'lh/remote-branches'

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

--
cgit v0.9.0.2