merged branch Tobion/patch-1 (PR #529)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 23 Nov 2011 11:06:36 +0000 (12:06 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 23 Nov 2011 11:06:36 +0000 (12:06 +0100)
Commits
-------

4802f69 fixing and improving PHPDoc in Template.php

Discussion
----------

fixing and improving PHPDoc in Template.php


Trivial merge