Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 6 Aug 2011 14:17:04 +0000 (16:17 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 6 Aug 2011 14:17:04 +0000 (16:17 +0200)
commit1c53471115c16a6c488147ec93bd7b50100c03c6
tree65e71dda103de8a8b72c31fff18049a0d76853f6
parent582fcb2fa45a9b4811fec528c6d10a951edc3643
parenteb9c835bff372f406f150246133760a078e95577
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage