Merge branch 'master' into identica-badge
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 15 Apr 2012 09:51:47 +0000 (11:51 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 15 Apr 2012 09:51:47 +0000 (11:51 +0200)
commita6df37c393d10cde4051b651c86c5d80f40722e0
tree7f4ff164a6d1e7debc95b1bb72f8258e9d872aa1
parentc4b4ec6798e2e22f0bf403096c3bee1568b311dc
parent00b723d82843b4463c9b042a47f7a76d6e73eb70
Merge branch 'master' into identica-badge
index.mdwn