5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-25 16:04:35 +01:00
commit 0b9a0a3517
1431 changed files with 5962 additions and 2175 deletions

View file

@ -1,6 +1,6 @@
/*
Copyright (c) 2007, 2012, Oracle and/or its affiliates.
Copyright (c) 2008, 2013, Monty Program Ab
Copyright (c) 2007, 2013, Oracle and/or its affiliates.
Copyright (c) 2008, 2014, SkySQL Ab.
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