bzrmirror%bugzilla.org 81d0ccc2e1 Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla into docs-relicensing
(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


git-svn-id: svn://10.0.0.236/trunk@265740 18797224-902f-48f8-a5cc-f745e15eee43
2014-12-03 22:39:24 +00:00
..
WIP
2014-12-03 22:15:43 +00:00