added documentation for previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Sat, 6 Aug 2011 06:40:52 +0000 (08:40 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sat, 6 Aug 2011 06:44:04 +0000 (08:44 +0200)
commit46eccb9ab56355cd7c7b4de1a39fdd94232260d3
treebd2ae6c67fdc6967415c928427ea54bde3b72450
parentd306dabea349185801c6cd27ad3b0fb4b8cabe7b
added documentation for previous merge
CHANGELOG
doc/templates.rst