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)
1  2 
index.mdwn

diff --cc index.mdwn
Simple merge