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

Merge tag 'upstream/5.5.49' into ubuntu-14.04

Upstream version 5.5.49
parents 516ad142 d97fe3f6