Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:32:59 +0000 (13:32 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:32:59 +0000 (13:32 +0100)
commit7c6ce75e2cc218e193b765149e619d1c9c69cbd6
treee57fbbba1efe88d6b24aecf38b38790ca27fe089
parent12dfe6568c82ba0e55286d1b604044f948dd16f2
parent7c433cbbce83bc9f2f9967afba00bbb68e312657
Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'

Conflicts:
meta/Makefile.am
doc/ref/api-io.texi
meta/Makefile.am