Merge from develop

Merge from develop
This commit is contained in:
MassimilianoPinto
2015-09-07 14:49:50 +02:00
13 changed files with 1207 additions and 1116 deletions

View File

@ -13,7 +13,7 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright MariaDB Corporation Ab 2013-2014
* Copyright MariaDB Corporation Ab 2013-2015
*
*/