Sync with master
authorMarco Costalba <mcostalba@gmail.com>
Sun, 22 Feb 2015 13:19:12 +0000 (14:19 +0100)
committerMarco Costalba <mcostalba@gmail.com>
Sun, 22 Feb 2015 13:20:23 +0000 (14:20 +0100)
bench: 8253813

1  2 
src/evaluate.cpp

Simple merge