tree 78887d1ef04b4a16c5f3100e59d7a49860fd304f
parent 65642543be14725de84e0ecbe8d17d5933695e9c
parent da5fe2b13b4cd96c6580663729a57e8428184e6e
author JArod <jarodwen@gmail.com> 1369263833 -0700
committer JArod <jarodwen@gmail.com> 1369263833 -0700

Merge branch 'jarodwen/hotfix/issue396' with updated wiki pages and the fix for issue 396.