# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1348245905 -7200
# Node ID 1a91124dd3429247cacab3d2acaaea406d855a6c
# Parent  8e8546a738b508e01be4a3ceccf03a6cd801a595# Parent  b9a9328822824e064b2de72f9d06194c17ac1bef
Merge branch 'stable'

Compatibility changes for Automake 1.12 of src/gnutls-1-fixes.patch from stable branch ignored.

diff -r 8e8546a738b5 -r 1a91124dd342 src/gnutls-1-fixes.patch
diff -r 8e8546a738b5 -r 1a91124dd342 src/gnutls.mk