FindCPLEX.cmake: Added OS X search paths.
test-multicut: Check LINK_RT before linking against librt.
Merge pull request #152 from ilastik/mac-build-fixes

Mac build fixes
Merge pull request #153 from joergkappes/master

RINF
Merge pull request #154 from joergkappes/master

Clean up code
Merge pull request #155 from joergkappes/master

bugfixes and new solvers
Merge pull request #156 from joergkappes/master

bugfix mplp interface and macros in opengm_min_sum
Merge pull request #40 from opengm/master

update from opengm:master