Merge branch 'docs-relicensing' of git://github.com/markrcote/bugzilla-docs into...

diff --cc docs/en/rst/administering/categorization.rst
Simple merge

diff --cc docs/en/rst/administering/users.rst
Simple merge