From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 3 Dec 2010 20:17:18 +0000 (+0000)
Subject: Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src
X-Git-Url: http://vikisorsa.effi.org/?a=commitdiff_plain;h=294e04c5ff6899ac63aeb7650c30ec2615e1ce4c;hp=-c;p=.git

Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src
---

294e04c5ff6899ac63aeb7650c30ec2615e1ce4c