Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Nov 2011 16:50:45 +0000 (17:50 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 7 Nov 2011 16:50:45 +0000 (17:50 +0100)
commit6654953b9f0dc10b3f7c63987666728e8b006b92
tree71054fbdb82180503bf0906dac496e96b74df4f4
parent99253a4239c1f38c87cd914bc443e6ad41c87476
parentcb1eee345bed2ffb55d4b36b9512770e197840e7
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage