Commit 47aaf102 authored by Martin Sustrik's avatar Martin Sustrik

Merge branch 'maint'

* maint:
  maint: will become 2.0.9

Conflicts:
	builds/msvc/platform.hpp
	configure.in
parents 0fe7d3c9 99ddfa7d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment