Diff

COPYING @ 6791:e813e8cf6046

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 20 Aug 2015 13:05:22 +0200 (2015-08-20)
parent 4304:73bf8aab8b77
child 12353:5ace23519e71
line wrap: on
line diff