Merge branch 'master' of github.com:derickr/twig-ext
authorDerick Rethans <github@derickrethans.nl>
Sun, 20 Nov 2011 21:29:14 +0000 (21:29 +0000)
committerDerick Rethans <github@derickrethans.nl>
Sun, 20 Nov 2011 21:29:14 +0000 (21:29 +0000)

Trivial merge