Merge commit '54cded99dc5db94b1df0dc417161ebef7c60d874'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:44:23 +0000 (14:44 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:44:23 +0000 (14:44 +0100)
1  2 
doc/ref/api-memory.texi

Simple merge