From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 2 Jun 2011 17:16:09 +0000 (-0700)
Subject: Merge: memory_full, gnutls improvements
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=037e65b496485cf3bd570a805bac787abac39cf3;p=emacs.git

Merge: memory_full, gnutls improvements
---

037e65b496485cf3bd570a805bac787abac39cf3