Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 11 Oct 2009 12:05:32 +0000 (14:05 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 11 Oct 2009 12:05:32 +0000 (14:05 +0200)
commit194e36b3e729121567a9f9a1443ae7170e0c768f
tree9497c5c6d37ff218018b790f15c75904f4d925f5
parentfba9b3d4a30273cf7d20267c6c7e38f538ddc7be
parent22498fc8a94b57f7a29dedbcbd331ca1a1cd30b1
Merge branch 'master' of fettunta.org:/home/zack/git/homepage