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

Merge tag 'upstream/5.5.54' into ubuntu-14.04

Upstream version 5.5.54
parents 823a5cd5 aa39e58b