Merge tag 'upstream/2.0.1'
authorPeter Colberg <peter@colberg.org>
Sat, 16 Jul 2016 20:12:49 +0000 (16:12 -0400)
committerPeter Colberg <peter@colberg.org>
Sat, 16 Jul 2016 20:12:49 +0000 (16:12 -0400)
commita9ce020b5fe7a1cbd63309445f24035623dde416
tree252a0a70c1cc9cffc010a5a136b48897dd9f92f1
parent01213a8a08e9fe4445ff2c48da85cb7c1faed37b
parent67bd2dfc2cb43f3fdd410d921087c1974a12c471
Merge tag 'upstream/2.0.1'

Upstream version 2.0.1