Merge tag 'upstream/0.20'
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:26 +0000 (02:26 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Nov 2015 02:26:26 +0000 (02:26 +0000)
commitd90743b3b3da9f8da1dd76e925b5e6284361837b
treea3e430e3570967c064cd147b8fc3f797e28cb7df
parentc5d4756772d2d08fb6f7609854f236030dc9d571
parent8ae3345c296c24329f5889474dd633174d57b13b
Merge tag 'upstream/0.20'

Upstream version 0.20