Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 28 Nov 2009 10:55:24 +0000 (11:55 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 28 Nov 2009 10:55:24 +0000 (11:55 +0100)
commit975087a9ca284f33cea7f3b238a668d1d5d64586
tree0e1cd3de242ca59af425609fd5de12834ac8c48d
parentf36c703967e3ed39fa12931bc72bd16b10b4719c
parent4440faf123c205760963dc9e8f7ac95c9b2f3a7a
Merge branch 'master' of fettunta.org:/home/zack/git/homepage