Commit 3be21135 authored by Alexander Barkov's avatar Alexander Barkov

Merging from 5.1

parents 0cdc0a35 571e7809
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<charsets max-id="99"> <charsets max-id="99">
<copyright> <copyright>
Copyright (C) 2003 MySQL AB Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment