Merge branch 'next'
authorStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Mar 2012 17:08:14 +0000 (18:08 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Mon, 12 Mar 2012 17:08:14 +0000 (18:08 +0100)
commit81449e3795060ec3cd18dbf89aebba8d11ed8863
tree377c0faebff0c4074d06d3067fcb1d9c25c3c899
parent9c0937499a20a70cd5e35b50cb7a13c19cde1669
parentc7dfb4e659228b52a7744e499de80ae32b91af9d
Merge branch 'next'