diff options
author | Igor Babaev <igor@askmonty.org> | 2016-03-21 11:46:03 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2016-03-21 11:46:03 -0700 |
commit | 1fc2c63fb1ddc8622f370e59adeb2c512c7b7d63 (patch) | |
tree | 1aab7dc37457b2ee380fbabb488a6214b4f3d0ff /COPYING | |
parent | ec0fb660d7ac9d62374926e0e3f025a48975e806 (diff) | |
parent | f340aaeb52916d028a41ed771dfbbdd9dc4c3f88 (diff) | |
download | mariadb-git-1fc2c63fb1ddc8622f370e59adeb2c512c7b7d63.tar.gz |
Manual merge of branch 'bb-10.2-mdev8789' into 10.2
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions