Merge from mdeters/miplib branch (commit 'ce7c485182902ae43871057185095f71f74a8a58')
authorMorgan Deters <mdeters@cs.nyu.edu>
Sun, 3 Feb 2013 20:57:01 +0000 (15:57 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sun, 3 Feb 2013 20:57:01 +0000 (15:57 -0500)
commitc7892fd17983a27d06b56c47f8125d50c691451c
treef36040b5f38811d19f6b548e076799c1e82224c9
parent0695bc6fd69ac01873d541c8501de3c77ca21edf
parentce7c485182902ae43871057185095f71f74a8a58
Merge from mdeters/miplib branch (commit 'ce7c485182902ae43871057185095f71f74a8a58')