Diff

COPYING @ 7861:58dbe5afeb4a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 24 Jan 2017 21:24:03 +0100
parent 4304:73bf8aab8b77
child 12353:5ace23519e71
line wrap: on
line diff