From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 21 Mar 2011 18:24:59 +0000 (+0100)
Subject: Merge remote branch 'markstory/ticket-277'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=79ab9babedee7f737b95cd83d39480431a092c01;p=konrad%2Ftwig.git

Merge remote branch 'markstory/ticket-277'

* markstory/ticket-277:
  Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277
---

79ab9babedee7f737b95cd83d39480431a092c01