tree 8aaf0c86aa49dc0bacd55daeb2144d40c37ae8e0
parent a90b1f2f89a41b2fe061f5fdd3f84f08b961a887
parent 1d571971be8be78a92d31aad27dda4009770043f
author Mike Funk <mfunk@xulonpress.com> 1331144977 -0500
committer Mike Funk <mfunk@xulonpress.com> 1331144977 -0500

merged from develop, fixed conflict in user guide.