From: Gervase Markham Date: Thu, 30 Oct 2014 11:45:42 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.mozilla.org/bugzilla/bugzilla into docs-relicensing X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48a0dcaa94832f4f2ca998ac8dbca3187a2b5e24;p=thirdparty%2Fbugzilla.git 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 --- 48a0dcaa94832f4f2ca998ac8dbca3187a2b5e24