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

Merge tag 'upstream/5.5.46' into ubuntu-14.04

Upstream version 5.5.46
parents cf36a34d a90934f3