Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 08:10:59 +0000 (09:10 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 2 Mar 2010 08:10:59 +0000 (09:10 +0100)
commit41b7cccb319139afb74a456a6370e0498f6babdb
treeb66ddb5c463f5c5bc2df0ef2a41eb32525800045
parentf304e3da949ef67af27a783b551a59f3c27ae891
parent2c16bba26968c80f1727aaa98c7c73bffd49f60d
Merge branch 'master' of fettunta.org:/home/zack/git/homepage