Bug 234293 - complete the conversion from "query" terminology to "search" terminology. Patch by gerv; r=justdave, kiko, a=justdave.

Patch for bug 228894: Change HTML comments to template-toolkit ones for template version numbers; patch by GavinS <bugzilla@chimpychompy.org>; r=kiko; a=justdave.

Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.

Fix for bug 176509: "(this bug is not in your list)" no longer appears in the navigation bar when you aren't viewing a bug.
Patch by Jody McIntyre <jodym@oeone.com>
r=justdave

Bug 143231 - Changing a bug with an empty buglist gives a warning. Patch by jouni@heikniemi.net; 2xr=justdave.

Bug 135707 - rearrange templates to normalise filenames, and create directory structure which allows for localised versions of the templates. Earlier versions of these templates can be found, cvs removed, scattered around bugzilla/template/default; but there are no substantial changes between their initial checkin there and here.