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

Mon Jan 23 12:55:40 UTC 2017

On 23/01/17 11:48, Ferenc Wágner wrote:
> See man dpkg-mergechangelogs for a neat way to get rid of such spurious
> conflicts.

Oh such goodness! went straight in my .gitconfig, thanks! :D

  Etienne

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-shibboleth-devel/attachments/20170123/01c7f9b1/attachment.sig>