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)

Trivial merge