Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 23 Nov 2010 13:45:36 +0000 (14:45 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 23 Nov 2010 13:45:36 +0000 (14:45 +0100)
commitc1f4a7f9511503c0f3e9eae57de3484e66eb03e2
tree3cc7acb9f9110d6d93e46a4e8767363b684b60fe
parent67651e4d5c73771e085bc6cc8ed0eae3157c6b38
parentb34c39000d5f40d101f8fa4cdafb1c87a2be58f5
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage