Merge branch 'master' of git.upsilon.cc:homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Apr 2013 12:04:31 +0000 (14:04 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 27 Apr 2013 12:04:31 +0000 (14:04 +0200)
Conflicts:
personal/movies.mdwn


Trivial merge