Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src
authorLars Wirzenius <liw@liw.fi>
Mon, 13 Dec 2010 13:33:56 +0000 (13:33 +0000)
committerLars Wirzenius <liw@liw.fi>
Mon, 13 Dec 2010 13:33:56 +0000 (13:33 +0000)
commitd830234c5710ea52181311055a16f8787d096475
treec201e5900cc4941594e7f61d723d1550604eef64
parent294e04c5ff6899ac63aeb7650c30ec2615e1ce4c
parenta317d30b1c1bdfce41277797f02457701048abfd
Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src