From 942a4c200168e110ec009c3260dc5f5f050de325 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 15 Mar 2009 08:05:49 +0000
Subject: Merge branch 'asciidoc'

---
(limited to 'git')

--
cgit v0.9.0.2