jmcmullen/olpc-teacher-update — pull request #3 by quozl (2014-09-04 01:19:50+00:00)
Title: Patch 2

Fixed conflicts, and broke the patch into smaller patches.