Merge branch 'master' into identica-badge
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 15 Apr 2012 09:54:51 +0000 (11:54 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 15 Apr 2012 09:54:51 +0000 (11:54 +0200)
commit89a83e31dd5e4198d3da07b7425b79d8f7c79e2d
tree1d6ea2db27390d81bc0fc7973e240d22275e0dbc
parenta6df37c393d10cde4051b651c86c5d80f40722e0
parenta4fb214d7924dd0b31cf513c588304e45896da0e
Merge branch 'master' into identica-badge