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)

Trivial merge