merged branch seferov/master (PR #6956)

fabpot · fabpot · commit 21af63a2ffc3 · 2013-02-04T10:48:57.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6956). Commits ------- 15625b4 typo Discussion ---------- typo
diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md
@@ -238,7 +238,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * d67d419: [HttpFoundation] added missing trustProxy condition
  * efce640: [Yaml][Parser] throw an exception if not readable
  * aa58330: [Form] fixed flawed condition
- * 253eeba: [BugFix][Validator] Fix for PHP incosistent behaviour of ArrayAccess
+ * 253eeba: [BugFix][Validator] Fix for PHP inconsistent behaviour of ArrayAccess
  * 0507840: Prevent parameters from overwriting the template filename.
  * 9bc41d0: [HttpFoundation] Fixed #3053
  * 9441c46: [DependencyInjection] PhpDumper, fixes #2730
