Joomla-Bible-Study/Joomla-Bible-Study — pull request #328 by genu (2014-03-07 04:12:37+00:00)
Title: Development

Fixed some merge conflicts

Should be up to date now