Merge branch 'debian-merge' into debian
commitf39cee375472a6e3a4f0decb7e2f91c5768a2165
authorPeter Palfrader <peter@palfrader.org>
Sat, 25 Jul 2009 09:15:42 +0000 (25 11:15 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sat, 25 Jul 2009 09:15:42 +0000 (25 11:15 +0200)
tree28772c7d359ebbd534624a98c526d2ed4b0ac16f
parent95a662364544afc741dc2b203f939bd5a2f126fd
parent805b19e4f138d3610ae8a2ab07b490413da450de
Merge branch 'debian-merge' into debian

* debian-merge:
  New upstream version
  bump to 0.2.1.18
  put in the full 0.2.1 release notes
  add a changelog entry for the upcoming 0.2.1.18
  make phobos's lines start with tabs again
  added LIBS=-lrt to Makefile.am for static libevent in the tor rpms.
  forward-port the 0.2.0.35 release notes
  add blurbs for recent release candidates
  Bump version to 0.2.1.17-rc-dev