Conflicts:
	bindings/pyroot/src/MethodProxy.cxx
	cmake/modules/RootConfiguration.cmake
	etc/http/files/main.htm
	etc/http/files/single.htm
	geom/geompainter/src/TGeoChecker.cxx
	graf2d/mathtext/inc/mathtext.h
	graf2d/mathtext/src/fontembed.cxx
	graf2d/mathtext/src/fontembedps.cxx
	graf2d/qt/inc/TQtCanvasPainter.h
	gui/qtgsi/src/TQRootCanvas.cxx
	hist/hist/src/TBackCompFitter.cxx
	hist/hist/src/TEfficiency.cxx
	hist/hist/src/TFractionFitter.cxx
	hist/hist/src/TGraphAsymmErrors.cxx
	hist/hist/src/TH2.cxx
	hist/hist/src/TH3.cxx
	hist/hist/src/TMultiDimFit.cxx
	hist/hist/src/TProfile.cxx
	hist/hist/src/TProfile2D.cxx
	hist/hist/src/TUnfoldBinning.cxx
	html/src/TDocParser.cxx
	math/foam/src/TFoam.cxx
	math/genvector/inc/Math/VectorUtil_Cint.h
	math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
	math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
	math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
	math/minuit2/inc/Minuit2/StackAllocator.h
	math/minuit2/src/TChi2ExtendedFCN.cxx
	math/minuit2/src/TChi2FCN.cxx
	math/minuit2/src/TFitterMinuit.cxx
	math/minuit2/src/TFumiliFCN.cxx
	misc/table/src/TTableDescriptor.cxx
	net/auth/src/rsaaux.cxx
	test/QpRandomDriver.cxx
	test/ios/RootBrowser/Src/Browser/Controllers/FileCollectionViewController.mm
	test/ios/RootBrowser/Src/Browser/Controllers/FileContentViewController.mm
	test/ios/RootBrowser/Src/Browser/Controllers/ObjectViewController.mm
	test/ios/RootBrowser/Src/Browser/Views/PadView.mm
	test/ios/RootBrowser/Src/CustomUI/RangeSlider.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisFontInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisLabelsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisTitleInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/FilledAreaInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1BinsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1ErrorsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1Inspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/InspectorWithNavigation.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/LineInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/MarkerInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/ObjectInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadTicksGridInspector.mm
	test/ios/Tutorials/PadOptionsController.mm
	test/ios/Tutorials/PadView.mm
	test/periodic/NdbMF.cxx
	test/periodic/NdbMTReacDesc.cxx
	test/periodic/NdbMTReactionXS.cxx
	test/periodic/NdbParticleList.cxx
	test/periodic/XSGui.h
	test/stressLinear.cxx
	test/stressRooFit_tests.cxx
	test/tcollbm.cxx
	test/vmatrix.cxx
	tutorials/eve/boxset.C
	tutorials/geom/geodemo.C
	tutorials/graphs/splines.C
	tutorials/hist/th2polyEurope.C
	tutorials/mc/CompareMasses.C
	tutorials/memstat/memstat.C

make version now only updates the sources without building anything.
The git commit is also automated to have the same log style thoughout.
Be helpful with what comes next by mentioning the release howto.

The changes are all related to the use of gendered or binary language in
the comments, messages, and documents (e.g. referring to the user explicitly
as "he" or "he/she").  I searched for thse instances and changed them to
the gender-neutral singular they (http://en.wikipedia.org/wiki/Singular_they).
In the process I fixed quite a few typos that would show up in the
auto-generated documentation.

By Jean-François Caron jfcaron@phas.ubc.ca).

a factor of 2 was gained in speed. Not clear how it got so slow
in the past. Probably because of the implementation of the features
of the DictSelection.
The timing for a debug build went from 460s to 255s.

Also add new option -ncpu to root-config reporting the number of
(hypethtreaded) cores in a machine independent way.

This is triggered by emitting operator<< 'class std::__1::basic_ostream<char,
struct std::__1::char_traits<char> > &(int)' even though its marked as exported
in general. Now that clang and libc++ agree on the handling of exported
templates we can remove our work-around.