From 1f4b0166f013089154ec4eeb00725ffdc3516260 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 26 Jan 2013 09:45:11 +0000
Subject: Merge branch 'master' into html

---
(limited to 'README')

--
cgit v0.9.1