Merge branch 'master' of git.upsilon.cc:homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 22 Jun 2013 10:18:39 +0000 (12:18 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 22 Jun 2013 10:18:39 +0000 (12:18 +0200)
commita216463a6bd335353e75248e4a72fed8c3524904
treebf2ef33cffd7f442d1998486539638b05a51ea2e
parent22323b091facb65ac0283d622ab0a2b46e06638d
parentcb4caef6a69215d08e0d323e740bdcefc8820bea
Merge branch 'master' of git.upsilon.cc:homepage