Merge remote branch 'jpb0104/master'
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 18 May 2011 06:05:56 +0000 (08:05 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 18 May 2011 06:05:56 +0000 (08:05 +0200)
commit5fd8f1f2f91336c22324521cd1d2db431f1f533f
tree2350a419e06a477d8568acb1b655f0c88926f2a6
parent654468ff5d085f8a74ef1bdb210d0518818c4970
parentc0447ec6feda1fe489ea86577ae2fcde4297de09
Merge remote branch 'jpb0104/master'

* jpb0104/master:
  Added an example of escaped "at" in a date filter.
doc/templates.rst