[wiki] [sites] Merge branch 'master' of git://git.suckless.org/sites || clamiax

From: <git_AT_suckless.org>
Date: Sat, 17 Oct 2015 16:39:36 +0200

commit 454ebd3bddff404a87a73e47b876aee3346bc85c
Merge: e9adf80 a9cb8d3
Author: clamiax <smoppy_AT_gmail.com>
Date: Sat Oct 17 16:38:55 2015 +0200

    Merge branch 'master' of git://git.suckless.org/sites
Received on Sat Oct 17 2015 - 16:39:36 CEST

This archive was generated by hypermail 2.3.0 : Sat Oct 17 2015 - 16:48:11 CEST