Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:54:17 +0000 (14:54 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:54:17 +0000 (14:54 +0100)
commit4247d8e34e410032a8a1f1fe036201c2be431090
treedadc152694f47d0f898780634f50dae96f5b9b7f
parent0a5b437ef9063df2a3728338a7cd6b86c4c2e275
parent5b7632331e7551ac202bbaba37c572b96a791c6e
Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e'

Conflicts:
module/oop/goops.scm
module/oop/goops.scm