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

From: <git_AT_suckless.org>
Date: Thu, 06 Dec 2012 22:44:02 +0100

commit 0586f369bf9a98587fd3e5de62b6a3ee25251913
Merge: 69db229 4ec838b
Author: John <punk_AT_suckless.org>
Date: Fri Dec 7 00:47:18 2012 +0100

    Merge branch 'master' of git://suckless.org/sites
Received on Thu Dec 06 2012 - 22:44:02 CET

This archive was generated by hypermail 2.3.0 : Thu Dec 06 2012 - 22:48:06 CET