tree 12c5339936795e7f0e022bd341a60eb62c1d6c78
parent 21f1267bad4d8c523fae483104d4348cfb279cfe
parent 6f603acaaa3a1b0738bd7e9489f298f022974eea
author Alon Zakai <alonzakai@gmail.com> 1467764814 -0700
committer Alon Zakai <alonzakai@gmail.com> 1467766322 -0700

Merge commit '6f603acaaa3a1b0738bd7e9489f298f022974eea' into next-merge-partial

Conflicts:
	autoconf/configure.ac
	configure
	tools/opt/Makefile