Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 15 Apr 2009 17:33:53 +0000 (19:33 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 15 Apr 2009 17:33:53 +0000 (19:33 +0200)
commitd1c938f4c001b813693e79bb63ed9b811976a381
tree130aed78f8cd3662d21b5a7a242eee90d84b401c
parent2e87a91a513dc1ab146f1b802bed334c30561242
parentf5b16c50ee87af466b45d2e7ad940b8e0bf7bd66
Merge branch 'master' of fettunta.org:/home/zack/git/homepage