Merge branch 'master' of upsilon.cc:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 28 Mar 2011 21:07:06 +0000 (23:07 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 28 Mar 2011 21:07:06 +0000 (23:07 +0200)
commit8f4853d6049b913a9b4922c5c9370d503acd0c3d
tree4eba51ec1fb77fa9c7e5f0db718742f06b1a400f
parent09c243c51f54b965e84b0419f398ca166abf301c
parent0cd48c8ea08642d02d2d87b49e015a3d558ecaed
Merge branch 'master' of upsilon.cc:/home/zack/git/homepage