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)
commitb0154d2634ad0ee0faee2ab46194b4c39f8840d3
tree3da0c44fb06e5fc05a2c49b786dbfee523e2a5a8
parentee7b1b4364559191cf9adf157b9a03877c398e74
parent8a86940ac3922b062300b40c4f99dbd54770c45c
Merge branch 'next'