Update templates.rst

Fixed typo (missing word).
Fixed fetching of a property defined but not initialized in C extension, fixed #1337
bug #1338 Fixed fetching of a property defined but not initialized in C extension (tucksaun)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed fetching of a property defined but not initialized in C extension

This PR fixed #1337

Commits
-------

6e800d8 Fixed fetching of a property defined but not initialized in C extension, fixed #1337
prepared the 1.15.1 release
bumped version to 1.15.2-DEV
Update intro.rst

Quote the shell command, since it contains an asterisk (*).
minor #1339 Update intro.rst (Carpetsmoker)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Update intro.rst

Very minor issue: quote the shell command, since it contains an asterisk (*)

Commits
-------

d73d612 Update intro.rst
Fixed a number of grammatical errors and the like
Fixed 1.15.1 changelog date
minor #1345 Fixed 1.15.1 changelog date (XWB)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed 1.15.1 changelog date

Commits
-------

1b98da7 Fixed 1.15.1 changelog date
minor #1344 Fixed a number of grammatical errors and the like (jegesh)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed a number of grammatical errors and the like

Commits
-------

e2f0b2e Fixed a number of grammatical errors and the like
Added additional example to min/max doc
minor #1336 Added additional example to min/max doc (c33s)

This PR was squashed before being merged into the 1.15-dev branch (closes #1336).

Discussion
----------

Added additional example to min/max doc

* fixed typo in the word "four"
* added an additional example with letters

Commits
-------

b709577 Added additional example to min/max doc
minor #1327 Update templates.rst (granitegreg)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Update templates.rst

Fixed typo (missing word).

Commits
-------

e278aee Update templates.rst
Update CHANGELOG - New update will be in 2014

Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.
Fixed recursively calling blocks in templates with inheritance
Add "broken" block inheritance test case
minor #1355 Update CHANGELOG - New update will be in 2014 (PieterWaegeman)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Update CHANGELOG - New update will be in 2014

Since time travel isn't invented yet, the next update will (hopefully) take place in 2014, not in 2013.

Commits
-------

3b4cd96 Update CHANGELOG - New update will be in 2014
bug #1361 Fixed recursively calling blocks in templates with inheritance (hason)

This PR was merged into the 1.15-dev branch.

Discussion
----------

Fixed recursively calling blocks in templates with inheritance

Replaces #1321
Fixes KnpLabs/KnpMenu#136 and KnpLabs/KnpMenu#119

Commits
-------

efb7b47 Add "broken" block inheritance test case
ef98ea2 Fixed recursively calling blocks in templates with inheritance
updated CHANGELOG