Merge remote branch 'nikic/fixWrongMethodCallInTest'
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 11 Apr 2011 16:51:49 +0000 (18:51 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 11 Apr 2011 16:51:49 +0000 (18:51 +0200)
commit27f44bfe5427549bf34f5a51a7fc12b2c381a0ae
tree597eb83d9d97ae75a27f2ef7ff24844cd52326fd
parent599a508d89d46f428c03d45e863f54c95d06367c
parent9a79078dd2cbe3e593321de81541cdd9edfef96a
Merge remote branch 'nikic/fixWrongMethodCallInTest'

* nikic/fixWrongMethodCallInTest:
  $e->setFilename to $e->setTemplateFile in integrationTest