bertwesarg

diff --git i/jinja2/lexer.py w/jinja2/lexer.py
index 69865d0..6a540e2 100644 jinja2/lexer.py
--- i/jinja2/lexer.py
+++ w/jinja2/lexer.py
@@ -549,7 +549,12 @@ class Lexer(object):
         """This method tokenizes the text and returns the tokens in a
         generator.  Use this method if you just want to tokenize a template.
         """
+        add_final_nl = False
+        if source[-2:] is '\r\n' or source[-1] in ['\r', '\n']:

bertwesarg

This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Open MPI configure 1.8.4, which was
generated by GNU Autoconf 2.69.  Invocation command line was

  $ ../configure --prefix=/home/wesarg/opt/openmpi-1.8.4 --disable-vt --disable-libompitrace --enable-mem-debug --enable-mem-profile --enable-debug --enable-pretty-print-stacktrace --enable-orterun-prefix-by-default --enable-wrapper-rpath --enable-builtin-atomics --with-mpi-param-check=always --with-oshmem-param-check=always

## --------- ##
## Platform. ##

bertwesarg

## -*- mode: autoconf -*-

##
## This file is part of the Score-P software (http://www.score-p.org)
##
## Copyright (c) 2009-2012,
## RWTH Aachen University, Germany
##
## Copyright (c) 2009-2012,
## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany