| commit | 1909b5b1dd5e2d6847cbe4a87a0aadd52b506681 | [log] [tgz] |
|---|---|---|
| author | Mike Funk <mfunk@xulonpress.com> | Wed Mar 07 13:29:37 2012 -0500 |
| committer | Mike Funk <mfunk@xulonpress.com> | Wed Mar 07 13:29:37 2012 -0500 |
| tree | 8aaf0c86aa49dc0bacd55daeb2144d40c37ae8e0 | |
| parent | a90b1f2f89a41b2fe061f5fdd3f84f08b961a887 [diff] | |
| parent | 1d571971be8be78a92d31aad27dda4009770043f [diff] |
merged from develop, fixed conflict in user guide.