Merge branch 'master-2.2'

Conflicts:
	.gitignore
	core/constant_inc.php

doc/CREDITS

@@ -73,62 +73,61 @@ Lincoln Maskey
 Marcello Scata
 Alexey Chumakov
 beerfrick
-Kornel Lesinski
 Bastian Pfenningschmidt
+Kornel Lesinski
 Adrian Spinei
-zakman
-Martin Fuchs
 Joel C. Llano
+Martin Fuchs
+zakman
 jbrugger
 jctrosset
 Vladimir Shulev
 Kirill Krasnov
-ryandesign
 Bob Le Bricodeur
+ryandesign
 rufinus
 David Newcomb
 Rasmus Lerdorf
 jhuggins
-yarick123
 translatewiki.net
-robertjf
+yarick123
 jotel
-Luke Lee
+robertjf
 Frank Rodgers
+Luke Lee
 Chris Fitch
 Johan Guilbaud
-planser
 Tamás Gulácsi
 davidu
-smhanson
+planser
+Franck Villaume
+Matej Habrnal
 Véronique Maginot
 myplacedk
+smhanson
 vwegert
-Matej Habrnal
-Franck Villaume
-Vincent Sels
 Daniel Tschinder
 Stefan Pettersson
-torija
-scoates
+Vincent Sels
 Dominik Blunk
-cyclespersecond
-Val Kulkov
-Jim Hanley
 Giovanni Giacobbi
+Jim Hanley
 Stéphane Veyret
+Val Kulkov
+cyclespersecond
+scoates
+torija
+Alexander Ishmuradov
+Alexander Menk
 Christian Weiske
 Dan Moore
-puklos
+Markus Schneider
+Matt McCutchen
 Sebastian Limbach
-Alexander Ishmuradov
 Tarik Sedlarevic
-Markus Schneider
 jeckyhl
-Alexander Menk
-Matt McCutchen
 mfoXen
-petertc
+puklos
 Alexander Maringer
 Andreas Schopper
 Andreas Stieger
@@ -181,6 +180,7 @@ gcompagnon
 greenius
 mbaranski
 naveenbali
+petertc
 spidgorny
 tfromm
 wapznw

docbook/Admin_Guide/en-US/Revision_History.xml

@@ -6,21 +6,21 @@
 	<simpara>
 		<revhistory>
 			<revision>
-				<revnumber>2.2-2</revnumber>
-				<date>Sun Mar 12 2017</date>
+				<revnumber>2.2-3</revnumber>
+				<date>Wed Mar 22 2017</date>
 				<author>
-					<firstname>Victor</firstname>
-					<surname>Boctor</surname>
-					<email>vboctor@mantisbt.org</email>
+					<firstname>Damien</firstname>
+					<surname>Regad</surname>
+					<email>dregad@mantisbt.org</email>
 				</author>
 				<revdescription>
 					<simplelist>
-						<member>Release 2.2.1</member>
+						<member>Release 2.2.2</member>
 					</simplelist>
 				</revdescription>
 			</revision>
 			<revision>
-				<revnumber>1.3-18</revnumber>
+				<revnumber>2.2-2</revnumber>
 				<date>Sun Mar 12 2017</date>
 				<author>
 					<firstname>Victor</firstname>
@@ -29,7 +29,7 @@
 				</author>
 				<revdescription>
 					<simplelist>
-						<member>Release 1.3.7</member>
+						<member>Release 2.2.1</member>
 					</simplelist>
 				</revdescription>
 			</revision>

docbook/Developers_Guide/en-US/Revision_History.xml

@@ -8,21 +8,21 @@
 	<simpara>
 		<revhistory>
 			<revision>
-				<revnumber>2.2-2</revnumber>
-				<date>Sun Mar 12 2017</date>
+				<revnumber>2.2-3</revnumber>
+				<date>Wed Mar 22 2017</date>
 				<author>
-					<firstname>Victor</firstname>
-					<surname>Boctor</surname>
-					<email>vboctor@mantisbt.org</email>
+					<firstname>Damien</firstname>
+					<surname>Regad</surname>
+					<email>dregad@mantisbt.org</email>
 				</author>
 				<revdescription>
 					<simplelist>
-						<member>Release 2.2.1</member>
+						<member>Release 2.2.2</member>
 					</simplelist>
 				</revdescription>
 			</revision>
 			<revision>
-				<revnumber>1.3-18</revnumber>
+				<revnumber>2.2-2</revnumber>
 				<date>Sun Mar 12 2017</date>
 				<author>
 					<firstname>Victor</firstname>
@@ -31,7 +31,7 @@
 				</author>
 				<revdescription>
 					<simplelist>
-						<member>Release 1.3.7</member>
+						<member>Release 2.2.1</member>
 					</simplelist>
 				</revdescription>
 			</revision>