[DomCrawler] lowered parsed protocol string (fixes #6986)
merged branch cloppy/Dom-Crawler-fix (PR #7127)

This PR was merged into the 2.0 branch.

Commits
-------

cb03074 [DomCrawler] lowered parsed protocol string (fixes #6986)

Discussion
----------

[DomCrawler] lowered parsed protocol string (fixes #6986)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6986
| License       | MIT
| Doc PR        | symfony/symfony-docs#123

Are UTs needed for this?
[Form] Fixed "label" option to accept the value "0"
merged branch bschussek/issue6862 (PR #7150)

This PR was merged into the 2.0 branch.

Commits
-------

f8812b2 [Form] Fixed "label" option to accept the value "0"

Discussion
----------

[Form] Fixed "label" option to accept the value "0"

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

@fabpot: This commit will cause troubles when merging 2.0 into 2.1 and up. Tell me if you need help upon conflict resolution.
[Form] Added test for "label" option to accept the value "0"
merged branch bschussek/issue6862 (PR #7154)

This PR was merged into the 2.1 branch.

Commits
-------

00fbb7e [Form] Added test for "label" option to accept the value "0"

Discussion
----------

[Form] Added test for "label" option to accept the value "0"

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6862
| License       | MIT
| Doc PR        | -
[Form] Fixed TimeType not to render a "size" attribute in select tags
Update composer.json

Bump doctrine common dependency for symfony 2.1 users
merged branch guilhermeblanco/patch-13 (PR #7160)

This PR was merged into the 2.1 branch.

Commits
-------

f0704aa Update composer.json

Discussion
----------

Update composer.json

Bump doctrine common dependency for symfony 2.1 users

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

by stof at 2013-02-22T17:32:25Z

@guilhermeblanco what about using ``~2.2`` as Doctrine keeps BC between minor versions ?
merged branch bschussek/issue6153 (PR #7155)

This PR was merged into the 2.1 branch.

Commits
-------

b7bd630 [Form] Fixed TimeType not to render a "size" attribute in select tags

Discussion
----------

[Form] Fixed TimeType not to render a "size" attribute in select tags

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6153
| License       | MIT
| Doc PR        | -
[HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)
merged branch cloppy/2.1 (PR #7153)

This PR was squashed before being merged into the 2.1 branch (closes #7153).

Commits
-------

b2080c4 [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)

Discussion
----------

[HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6750
| License       | MIT
| Doc PR        |
Defined stable version point of Doctrine.
merged branch guilhermeblanco/patch-14 (PR #7161)

This PR was merged into the 2.1 branch.

Commits
-------

06ebb0d Defined stable version point of Doctrine.

Discussion
----------

Defined stable version point of Doctrine.

As per @stof suggestion, updated 2.1 branch to define the stable version point for Doctrine libraries. @fabpot it's all yours! =)

```
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
```
Merge branch '2.0' into 2.1

* 2.0:
  [Form] Fixed "label" option to accept the value "0"
  [DomCrawler] lowered parsed protocol string (fixes #6986)

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
updated CHANGELOG for 2.1.8
updated VERSION for 2.1.8
bumped Symfony version to 2.1.9-DEV
fixed CHANGELOG