sez11a/liferay-docs — pull request #636 by jhinkey (2013-09-12 15:23:49+00:00)
Title: Trunk dev guide updates and fixes

Hi Rich. This branch is deconflicted with master. Thanks.