step
Merge branch 'master' of https://github.com/exedre/funcparserlib-new

* 'master' of https://github.com/exedre/funcparserlib-new:
  initial import 20140410

Conflicts:
	src/funcparserlib/lexer.py