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

From: <git_AT_suckless.org>
Date: Mon, 13 Jan 2014 01:24:35 +0100

commit 86378f819d2278eb3b9bae11fac8bae187687ff1
Merge: 888ac17 cbd2c5b
Author: memeplex <carlosjosepita_AT_gmail.com>
Date: Sun Jan 12 21:24:23 2014 -0300

    Merge branch 'master' of git://git.suckless.org/sites
Received on Mon Jan 13 2014 - 01:24:35 CET

This archive was generated by hypermail 2.3.0 : Thu Jun 18 2015 - 17:38:05 CEST