optimize batch function and add tests
Ceil the size in batch filter
removed unneeded PHPdoc tags
deprecated use, -4 files to include.
merged branch minchal/master (PR #1013)

This PR was merged into the master branch.

Commits
-------

c82308a deprecated use, -4 files to include.

Discussion
----------

Depraceted use of Twig_Filter_Function in Core Extension

Simple fix, that reduces included files count by 4 (in default configuration).
merged branch Felds/optimize-batch (PR #1007)

This PR was merged into the master branch.

Commits
-------

ccf3cd1 optimize batch function and add tests

Discussion
----------

Optimize batch function and add tests

see https://github.com/fabpot/Twig/commit/a50bc8c95be668c35cda5a6efc6a1e8413d52670#commitcomment-2665059
Merge remote-tracking branch 'lyrixx/feat-batch-ceil'

* lyrixx/feat-batch-ceil:
  Ceil the size in batch filter

Conflicts:
	test/Twig/Tests/Fixtures/filters/batch.test
let url_encode filter also accept array of query parameters
merged branch Tobion/buildquery (PR #1009)

This PR was squashed before being merged into the master branch (closes #1009).

Commits
-------

fcf9525 let url_encode filter also accept array of query parameters

Discussion
----------

let url_encode filter also accept array of query parameters

BC break: no
feature addition: yes
tests pass: yes
documentation: yes

This is also supported in Jinja and so it's consistent: [jinja urlencode](http://modular.math.washington.edu/home/wstein/www/home/bjarke/sage-4.4.4/local/LIB/python/site-packages/Jinja-1.2-py2.6-linux-x86_64.egg/docs/html/builtins.html)
fixed phpdoc
Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array
merged branch carlwitt/patch-1 (PR #1022)

This PR was merged into the master branch.

Commits
-------

59d0eed Update merge.rst

Discussion
----------

Update merge.rst

Typo in first line:
The merge filter merges an array with [removed: the] another array
Fixed typos
merged branch pborreli/typos (PR #1028)

This PR was merged into the master branch.

Commits
-------

49488b8 Fixed typos

Discussion
----------

Fixed typos
Adding a section about the slice filter

This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
Update striptags.rst
Adding link to slice filter per Stof's suggestion
merged branch specialguest/patch-1 (PR #1034)

This PR was merged into the master branch.

Commits
-------

c6ef23a Update striptags.rst

Discussion
----------

Update striptags.rst

Hello

I just changed
{% some_html|striptags %}
to
{{ some_html|striptags }}

Regards

Julien
Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3, reversing
changes made to 5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1.
merged branch tucksaun/fix-5.2-TSRM (PR #1037)

This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"