Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:30:25 +0000 (13:30 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:30:25 +0000 (13:30 +0100)
commit12dfe6568c82ba0e55286d1b604044f948dd16f2
tree6522856c57af92b042e4d9a6964e16daceb57a6a
parenta5b5cb422e66f77cac34ded42631db6a067323cc
parent5fac1a7ada362d78f13143acbc0ceca7f2f101de
Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de'

Conflicts:
configure.ac
doc/ref/libguile-parallel.texi
configure.ac
doc/ref/libguile-parallel.texi
meta/Makefile.am
meta/guile-2.2.pc.in