merged branch shieldo/patch-1 (PR #670)
merged branch shieldo/patch-1 (PR #670)

Commits
-------

7f0cca0 fixed incorrect docblock

Discussion
----------

fixed incorrect docblock

---------------------------------------------------------------------------

by shieldo at 2012-03-19T18:15:41Z

True, and done.

---------------------------------------------------------------------------

by fabpot at 2012-03-19T18:19:33Z

Can you rebase your PR and squash your commits so that we don't have the merge? Thanks.

---------------------------------------------------------------------------

by shieldo at 2012-03-19T18:43:28Z

Sorry about that.  Done. :)

fsw/Twig,twigphp/Twig,peterkokot/Twig,hhamon/Twig,hason/Twig,hhamon/Twig,Tobion/Twig,derickr/Twig,nicolas-grekas/Twig,maartendekeizer/Twig,moufmouf/Twig,huang53798584/Twig,hason/Twig,fsw/Twig,Tobion/Twig,derickr/Twig,nicolas-grekas/Twig,robregonm/Twig,gencer/Twig,moltin/Twig,iKwinto/Twig,framewr/Twig,craue/Twig,jamessingizi/Twig,gencer/Twig,moltin/Twig,hason/Twig,moltin/Twig,sstok/Twig,twigphp/Twig,phansys/Twig,framewr/Twig,gamernetwork/Twig,Rvanlaak/Twig,dkarvounaris/Twig,moufmouf/Twig,phansys/Twig,znerol/Twig,robregonm/Twig,robregonm/Twig,dkarvounaris/Twig,iKwinto/Twig,apishka/templater,derickr/Twig,fsw/Twig,bocharsky-bw/Twig,Rvanlaak/Twig,nicolas-grekas/Twig,sstok/Twig,bocharsky-bw/Twig,bocharsky-bw/Twig,framewr/Twig,hhamon/Twig,gamernetwork/Twig,huang53798584/Twig,znerol/Twig,gamernetwork/Twig,markstory/Twig,apishka/templater,jamessingizi/Twig,znerol/Twig,Tobion/Twig,nicolas-grekas/Twig,iKwinto/Twig,craue/Twig,dkarvounaris/Twig,peterkokot/Twig,maartendekeizer/Twig,loi-chuanoi/Twig,jamessingizi/Twig,huang53798584/Twig,moufmouf/Twig,nicolas-grekas/Twig,markstory/Twig,Rvanlaak/Twig,twigphp/Twig