tweaked merge filter
authorFabien Potencier <fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:44:10 +0000 (09:44 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Thu, 16 Dec 2010 08:44:10 +0000 (09:44 +0100)
commit9a793744c678c1face970fcb9499affb24c2cc0d
tree11db2bd113356133a684c5fc015d0fde80462bf2
parent78b104bfc3d31bbafa98fa44246ce23c2a089cfa
tweaked merge filter
doc/templates.rst