Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 3 Jan 2010 21:09:45 +0000 (22:09 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 3 Jan 2010 21:09:45 +0000 (22:09 +0100)
commit64805fdcec9ea9d7ef88817db71bfef81e68654d
tree7e55c4b34ce0feecb1ddd2778fd649ad519287e8
parent500c3532e9bc0bd403a09b93c0a2de3dc3206c83
parent23cc0903f2a37c87e37b58ab83810df2d8a9c587
Merge branch 'master' of fettunta.org:/home/zack/git/homepage