[wiki] [sites] Merge remote-tracking branch 'origin/master' || Krister Svanlund

From: <git_AT_suckless.org>
Date: Sun, 02 Dec 2012 12:08:58 +0100

commit e21508be53c2e0905b24c08bfe3afcdc7224b033
Merge: 50fd8b0 7c5307f
Author: Krister Svanlund <krister.svanlund_AT_gmail.com>
Date: Sun Dec 2 12:08:37 2012 +0100

    Merge remote-tracking branch 'origin/master'
Received on Sun Dec 02 2012 - 12:08:58 CET

This archive was generated by hypermail 2.3.0 : Sun Dec 02 2012 - 12:12:05 CET