tree c04bcc945ba4852b96509d9e66e29262a3835175
parent 986efafa5cd0ecf65cfb9466aa9232c407f6aa60
parent 572ab4ea588e292101860b2e3fbe6395015e94b4
author Wes Hardaker <hardaker@users.sourceforge.net> 1407554142 -0700
committer Wes Hardaker <hardaker@users.sourceforge.net> 1407554142 -0700

Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches: