unit29868/pressbooks — pull request #49 by bdolor (2014-04-03 16:30:57+00:00)
Title: merging with the latest dev branch

merging with the latest from dev branch at pb/pb