Skip to content
Commit 30f2c930 authored by berenddeboer's avatar berenddeboer
Browse files

Merge commit '6cdb3f09' into 7.x-1.x

Conflicts:
	bible.install
	bible.module
parents 8edcfa9c 6cdb3f09
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment