updated CHANGELOG for 2.3.15
updated VERSION for 2.3.15
bumped Symfony version to 2.3.16
updated CHANGELOG for 2.4.5
updated VERSION for 2.4.5
bumped Symfony version to 2.4.6
[DomCrawler] Fixed a forgotten case of complex XPath queries
bug #10987 [DomCrawler] Fixed a forgotten case of complex XPath queries (stof)

This PR was merged into the 2.3 branch.

Discussion
----------

[DomCrawler] Fixed a forgotten case of complex XPath queries

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10986
| License       | MIT
| Doc PR        | n/a

This fixes the case I forgot when rewritting the XPath to avoid making it produce invalid queries. I ran the new tests against the old implementation first, to ensure they cover the BC properly.

I could have detected it by running the Mink 1.5 testsuite with the new code (which is the case for people reporting the bug), but I only ran it for Mink 1.6 which does not produce such XPath anymore.

Commits
-------

a9de61e [DomCrawler] Fixed a forgotten case of complex XPath queries
[TwigBridge][Trans]set %count% only on transChoice
bug #10995 [TwigBridge][Trans]set %count% only on transChoice from the current context. (aitboudad)

This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge][Trans]set %count% only on transChoice from the current context.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8408
| License       | MIT

Commits
-------

d176ffc [TwigBridge][Trans]set %count% only on transChoice
Merge branch '2.3' into 2.4

* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
Merge branch '2.4' into 2.5

* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
Make rootPath part of regex greedy

- Fixes #10977
bug #10979 Make rootPath part of regex greedy (artursvonda)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10979).

Discussion
----------

Make rootPath part of regex greedy

- Fixes #10977
- Also replaced `isset() && true` with simple `!empty()` which is equivalent.

Commits
-------

31da839 Make rootPath part of regex greedy
[HttpKernel] simplified some tests
Revert "[HttpKernel] simplified some tests"

This reverts commit ccacd8d2af428de1cf3df3e25757d4e4a20ab5e1.
Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"

This reverts commit 9766c72324e3a073bc76eeafd754479a7dd01d8b, reversing
changes made to 168174af08f213f6797fde47a570356c0e4919e0.
Revert "fixed CS"

This reverts commit 11816c5e518bf6e1aa25f457bd861394a6e4bf1d.
Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"

This reverts commit 7dc8931969cdf55820c40757a1da9906b9fb013d, reversing
changes made to 309046a2072efe83d2f3cf7da87d6b76d33429a4.
Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"

This reverts commit 735e9a4768962b6d5098733c347cff0df6b9cd36, reversing
changes made to 5c91dc1a3a49c6d5fdc05fea3962355badf8e9fd.