removed unnecessary cplex macro
added wrapper for MPLP
added missing patch for MPLP
Merge pull request #38 from stopfer/master

removed unnecessary cplex macro
add greedy gremlin, bugfix daoopt
Merge branch 'master' of ssh://github.com/joergkappes/opengm
bugfix daoopt mplp
Merge pull request #155 from joergkappes/master

bugfixes and new solvers
bugfix mplp interface and macros in opengm_min_sum
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
fix typo in opengm_min_sum causes unincluded headers if cplex was disabled
Merge pull request #157 from joergkappes/master

fix typo that causes broken build
Merge pull request #14 from opengm/master

getting master update