[Component][HttpKernel] fixed testGetRootDir() on Win
[Security] fixed in_memory provider example
[Security] Fix typo in docblock
slovenian validators translations updated
merged branch adrienbrault/patch-1 (PR #4780)

Commits
-------

0a4fd43 [Security] Fix typo in docblock

Discussion
----------

[Security] Fix typo in docblock

Bug fix: no
Feature addition: no
Backwards compatibility break: yes
Symfony2 tests pass:
Fixes the following tickets:
Todo:
License of the code: MIT
Documentation PR:
merged branch peterkokot/translations (PR #4784)

Commits
-------

df66d90 slovenian validators translations updated

Discussion
----------

Slovenian validators translations updated

Updated Slovenian validators translations for master branch.
merged branch arnaud-lb/memory-example-fix (PR #4769)

Commits
-------

8997853 [Security] fixed in_memory provider example

Discussion
----------

[Security] fixed in_memory provider example

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

This fixes the in_memory provider configuration example shown by config:dump-reference

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

by stof at 2012-07-06T11:07:50Z

:+1:
[HttpKernel] Fix #4719. Added condition which verify existence of profiler dump file. If file does not exists script inserts record to csv file.
merged branch yanoosh/ticket_4719 (PR #4779)

Commits
-------

74aa502 [HttpKernel] Fix #4719. Added condition which verify existence of profiler dump file. If file does not exists script inserts record to csv file.

Discussion
----------

[HttpKernel] Ticket #4719. Each call of FileProfilerStorage->write method adds row to index file.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

Each call of FileProfilerStorage->write method adds row to index file even if profiler dump is only updated. Event dispatcher in kernel call several times write method to save fresh profiler info. I add condition which checks if profiler file already exist then ignore add row to index file.

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

by fabpot at 2012-07-08T08:04:33Z

Can you squash your commits before I merge? Thanks.

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

by yanoosh at 2012-07-08T10:08:48Z

Ready to merge.
merged branch gajdaw/kernel_test_fix (PR #4766)

Commits
-------

6de6806 [Component][HttpKernel] fixed testGetRootDir() on Win

Discussion
----------

[Component][HttpKernel] fixed testGetRootDir() on Win

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/gajdaw/symfony.png?branch=kernel_test_fix)](http://travis-ci.org/gajdaw/symfony)
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

Method `getRootDir()` returns path containing slashes. On Windows machine `__DIR__` and `DIRECTORY_SEPARATOR` are backslashes. To pass the test on win machine we have to translate `\` into `/`.
[Form] Fixed failing test in AbstractLayoutTest
merged branch bschussek/testfix (PR #4787)

Commits
-------

2e1941f [Form] Fixed failing test in AbstractLayoutTest

Discussion
----------

[Form] Fixed failing test in AbstractLayoutTest

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Form] Fixed failing test in AbstractLayoutTest
  [HttpKernel] Fix #4719. Added condition which verify existence of profiler dump file. If file does not exists script inserts record to csv file.
  slovenian validators translations updated
  [Security] Fix typo in docblock
  [Security] fixed in_memory provider example
  [Component][HttpKernel] fixed testGetRootDir() on Win