Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Sep 2009 10:36:18 +0000 (12:36 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Sep 2009 10:36:18 +0000 (12:36 +0200)
commitc0acbbcdb100924313f4236993a5df95e52b8a99
tree2bbdaf6766625d4ada056c83dcd6183dd6ce1dcb
parent9f5d11c473daea1bdcd8465939697fdea2183ae5
parent92b4db4d6a911f9d1d5c9a5301b576f8cf9a323c
Merge branch 'master' of fettunta.org:/home/zack/git/homepage