Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 7 Dec 2008 12:11:23 +0000 (13:11 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 7 Dec 2008 12:11:23 +0000 (13:11 +0100)
commit3a62080376dd7d6e9e7a4a05dba05f4975f76669
tree0cc16412e353cbbc0d2edefc8e5cad88e1ccd7fe
parent141964c9d65c025d6a66146fe9b62e165fa2d123
parentafc2b007e45f2a09c4d59791ed7131f32ba9ca9b
Merge branch 'master' of fettunta.org:/home/zack/git/homepage