tree 8e22ccae1305d70b6969ec42f276da22aa73b38e
parent 10a1d3847ba08404a4009b3589b0cc142c3b0bbc
parent b0ac351e670957f95f83672e430cff1defe3dedf
author Jonathan Nieder <jrnieder@gmail.com> 1341433809 -0500
committer Jonathan Nieder <jrnieder@gmail.com> 1341433809 -0500

Merge branch 'jn/cli'

--block-list was added in the 5.1.2alpha release because someone
needed it, but the implementation and interface are not finished so
it's best in Debian to leave it out.

Thanks to Lasse Collin for advice.

* jn/cli:
  Remove support for --block-list