From: Raspbian forward pporter <root@raspbian.org>
Date: Sat, 1 Jul 2017 23:31:05 +0000 (+0100)
Subject: pseudomerge to tie together broken upstream history
X-Git-Tag: archive/raspbian/2.2.6-2+rpi1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ebd1d45a0eb61566a4299f056a4ea7bb6e3f26b5;p=vlc.git

pseudomerge to tie together broken upstream history
---

ebd1d45a0eb61566a4299f056a4ea7bb6e3f26b5