Merge branch 'qipeng-solvers' into dev
authorJeff Donahue <jeff.donahue@gmail.com>
Mon, 1 Sep 2014 21:13:56 +0000 (14:13 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Mon, 1 Sep 2014 21:13:56 +0000 (14:13 -0700)
commit88e17976f6a19c4936bf7869ae01743203f49485
tree4753427fc9423cb75a980ef2d1bc7a73cbc3819d
parent5f350aa24654337555ef07f790a10c10a188bef7
parentb0f97fda761b8687503a36f4545bedd6497f3c92
Merge branch 'qipeng-solvers' into dev