Merge branch 'next'
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 4 Oct 2012 16:42:42 +0000 (18:42 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 4 Oct 2012 16:42:42 +0000 (18:42 +0200)

Trivial merge