From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 11 Apr 2011 16:51:49 +0000 (+0200)
Subject: Merge remote branch 'nikic/fixWrongMethodCallInTest'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=27f44bfe5427549bf34f5a51a7fc12b2c381a0ae;p=web%2Fkonrad%2Ftwig.git

Merge remote branch 'nikic/fixWrongMethodCallInTest'

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

27f44bfe5427549bf34f5a51a7fc12b2c381a0ae