From: David Leadbeater <redacted>
Date: Sat, 10 Jan 2015 16:57:01 +0000 (+0000)
Subject: Merge branch 'gh-pages' of gh:irssi/scripts.irssi.org into gh-pages
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=cbbdf2a1d93dbb64d3fb34346e9c57b14dfa2931;p=irssi-scripts.irssi.org.git

Merge branch 'gh-pages' of gh:irssi/scripts.irssi.org into gh-pages

Conflicts:
	_data/scripts.yaml
---

cbbdf2a1d93dbb64d3fb34346e9c57b14dfa2931