Merge remote-tracking branch 'alekstorm/template_comment' into merge

diff --cc tornado/template.py
index 01927d60c80218e5bafbd0af23a579e2cfd7ac54,fea31c1f7353c4cc398259d29ca0da834be7934d..7883a44cecdb378e09f33bee68cdb45cc93c182c
--- 1/tornado/template.py
--- 2/tornado/template.py
+++ b/tornado/template.py
@@@ -709,9 -665,18 +712,18 @@@ def _parse(reader, template, in_block=N
          # which also use double braces.
          if reader.remaining() and reader[0] == "!":
              reader.consume(1)
 -            body.chunks.append(_Text(start_brace))
 +            body.chunks.append(_Text(start_brace, line))
              continue
  
+         # Comment
+         if start_brace == "{#":
+             end = reader.find("#}")
+             if end == -1:
+                 raise ParseError("Missing end expression #} on line %d" % line)
+             contents = reader.consume(end).strip()
+             reader.consume(2)
+             continue
+ 
          # Expression
          if start_brace == "{{":
              end = reader.find("}}")

diff --cc tornado/test/template_test.py
Simple merge