]> git.ipfire.org Git - thirdparty/bugzilla.git/commitdiff
Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla into docs-relicensing
authorGervase Markham <gerv@gerv.net>
Thu, 30 Oct 2014 11:45:42 +0000 (11:45 +0000)
committerGervase Markham <gerv@gerv.net>
Thu, 30 Oct 2014 11:45:42 +0000 (11:45 +0000)
(except some changes not merged; will do them later)

Conflicts:
docs/en/rst/administration.rst
docs/en/rst/installation.rst
docs/en/rst/using.rst


Trivial merge