]> code.delx.au - gnu-emacs/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 28 Dec 2014 08:07:00 +0000 (00:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 28 Dec 2014 08:07:00 +0000 (00:07 -0800)
commit1505643bb70ce66e86d6c72902fe7e9199e93606
tree0287f1d5f6ff9f6e25184fc843dddb7fe5125257
parent9bb10cbdc59486c2131cea9b5399e9cbdc0418ab
parentb54f5721bfb6bf21cac5402cf34a8130e11bfb70
Merge from origin/emacs-24

b54f572 Port memory-full checking to GnuTLS 3.3

Conflicts:
  src/ChangeLog
  src/gnutls.c
src/ChangeLog
src/gnutls.c