[shibboleth-sp2] 01/02: Merge branch 'debian/master' into debian/jessie-backports

[Ferenc Wágner]

Etienne Dysli Metref <edm-guest at moszumanska.debian.org> writes:

> commit f90b78ca684f95623f4391a186fb37a0956f5605
> Merge: 737082d 65599a2
> Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
> Date:   Mon Dec 19 17:15:37 2016 +0100
>
>     Merge branch 'debian/master' into debian/jessie-backports
>     
>     Conflicts:
>     - debian/changelog

See man dpkg-mergechangelogs for a neat way to get rid of such spurious
conflicts.
-- 
Regards,
Feri