updated the CHANGELOG and documentation for previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 15 Feb 2012 16:27:33 +0000 (17:27 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 15 Feb 2012 16:29:31 +0000 (17:29 +0100)
commit4dee4e5841d1a59862b43ca8ed44a933f41e2024
tree87bad28b8c8d9733216a70851c6d64e2125f5cbc
parentf907eb4ac55134f680ae95171d4ec09ac052714a
updated the CHANGELOG and documentation for previous merge
CHANGELOG
doc/filters/date.rst
doc/functions/date.rst