Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 22 Jul 2008 15:25:54 +0000 (17:25 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 22 Jul 2008 15:25:54 +0000 (17:25 +0200)
commitebb19e7f7a9b645c8b0977b6d0c8ae01c8d81d57
tree24c403aac25dbb0f314212ed85cb8098bbd54f4b
parent5fe13219fcca5a8b8ea7a8f264e984c7f73faf12
parentd1666602865a0bad4eee6efb2c5511d0138bfa4f
Merge branch 'master' of fettunta.org:/home/zack/git/homepage