Merge branch 'master' into green-threads
authorDaniel Kochmański <daniel@turtleware.eu>
Sat, 12 Sep 2015 08:16:56 +0000 (10:16 +0200)
committerDaniel Kochmański <daniel@turtleware.eu>
Sat, 12 Sep 2015 08:16:56 +0000 (10:16 +0200)
1  2 
src/configure
src/configure.ac

diff --cc src/configure
Simple merge
Simple merge