From: David Leadbeater <redacted>
Date: Sun, 1 Feb 2015 10:39:14 +0000 (+0100)
Subject: Merge branch 'gh-pages' of git://github.com/lasers/scripts.irssi.org into gh-pages
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=cd5e3c6b33de69f0f9dde3cf42061512931e6069;p=irssi-scripts.irssi.org.git

Merge branch 'gh-pages' of git://github.com/lasers/scripts.irssi.org into gh-pages

Conflicts:
	_data/scripts.yaml
---

cd5e3c6b33de69f0f9dde3cf42061512931e6069