[Routing] add support for path-relative and scheme-relative URL generation
[Routing] added tests for generating relative paths and network paths
[Routing] made reference type fully BC and improved phpdoc considerably
fix phpdoc of UrlGeneratorInterface that missed some exceptions and improve language of exception message
[HttpFoundation] Update docblock for non-working method
added changelog entries
Enable arrow keys to browse matched autocomplete options
Restrict Monolog version to be in version `<1.3`.
Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)
[Form] Removed separator characters between choice or text fields in DateType
merged branch stloyd/bugfix/monolog_restrict (PR #6570)

This PR was merged into the 2.1 branch.

Commits
-------

4abd5bf Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)

Discussion
----------

[2.1] Restrict Monolog to be in version `<1.3`.

Because of conflict between `HttpKernel\Log\LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3).

---------------------------------------------------------------------------

by stof at 2013-01-05T13:09:29Z

This should even be done in the 2.0 branch

---------------------------------------------------------------------------

by stloyd at 2013-01-05T14:00:35Z

@stof See #6572.

---------------------------------------------------------------------------

by stloyd at 2013-01-05T14:05:39Z

@fabpot This is still valid PR (even when `2.0` will be merged to `2.1`) as main `composer.json` is pointing to invalid version.
[Form] Deleted references in FormBuilder::getFormConfig() to improve performance
Fixed @expectedException definitions to reference absolute exception paths
[2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd
merged branch bschussek/exceptionfix (PR #6582)

This PR was merged into the master branch.

Commits
-------

184c8e5 Fixed @expectedException definitions to reference absolute exception paths

Discussion
----------

Added leading slashes to @expectedException definitions

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

This PR adds leading backslashes `\` to `@expectedException` declarations.

The current version is inconsistent with other class references in doc blocks, which default to *relative* class names unless class name has a leading backslash.

```php
/**
 * @param RelativeNs\Class $param1
 * @param \AbsoluteNs\Class $param2
 */

but

/**
 * @expectedException AbsoluteNs\Class
 */
```

Consequently, PHPStorm does not understand the current statements and marks them as erroneous (and correctly so IMO, even though PHPUnit's interpretation is more relaxed).
merged branch gigablah/terminal-dimensions-fix (PR #6581)

This PR was merged into the 2.1 branch.

Commits
-------

8f21f89 [2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd

Discussion
----------

[2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

For non-windows systems, the Console component makes use of `stty -a` to grab the dimensions of the terminal when formatting exception output. The regex pattern assumes a string like the following:

`speed 38400 baud; rows 25; columns 80; line = 0;`

However on OSX (and FreeBSD) the pattern is different:

`speed 38400 baud; 25 rows; 80 columns;`

This patch adds a fix to match the correct pattern on darwin/freebsd systems, and consolidates the code in `getTerminalWidth()` and `getTerminalHeight()` into a general `getTerminalDimensions()` function. I've also taken the liberty of changing the curly brace regex delimiters to forward slashes for consistency with the rest of the codebase.
merged branch bschussek/issue6217-no-dots-between-date-fields (PR #6575)

This PR was merged into the master branch.

Commits
-------

e0b4480 [Form] Removed separator characters between choice or text fields in DateType

Discussion
----------

[Form] Removed separator characters between choice or text fields in DateType

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

This commit was originally contained in #6217 (for 2.1) but then split away for master since it changes behavior.
Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"

This reverts commit 515769385a00b0fb1ddeafb6a0db1c50e8f6b8d2, reversing
changes made to cd0a9d7a1d5f383b931fff21a82e29d53362065e.
Merge branch '2.0' into 2.1

* 2.0:
  Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
[Console] made Application::getTerminalDimensions() public
Merge branch '2.1'

* 2.1:
  [Console] made Application::getTerminalDimensions() public
  Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
  [2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd
  Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)

Conflicts:
	composer.json