Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Jul 2009 09:08:24 +0000 (11:08 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Jul 2009 09:08:24 +0000 (11:08 +0200)
commit308e3a2ffa3be627a9ecbd0febb2496bf4493b2f
tree71cfe45d22b0ce38b0b173871fbea52e2e5250f3
parent6b7a003629056080dd2fe833825193dcd53ed050
parent22868a741de46ac9ac2d77dc5413eaa381c0223b
Merge branch 'master' of fettunta.org:/home/zack/git/homepage