Commit 2137df41 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Merge tag 'upstream/5.5.47' into ubuntu-14.04

Upstream version 5.5.47

Conflicts:
	debian/mariadb-server-5.5.mysql-server.logrotate
parents d315cf0b a295acf5