Merge branch 'master' of github.com:derickr/twig-ext
authorDerick Rethans <github@derickrethans.nl>
Mon, 21 Nov 2011 08:37:45 +0000 (08:37 +0000)
committerDerick Rethans <github@derickrethans.nl>
Mon, 21 Nov 2011 08:37:45 +0000 (08:37 +0000)

Trivial merge