Merge 1.0.x into master#51

Merged

gourlaysama merged 7 commits intoscala:masterfrom

lrytz:merge-1.0.x

May 8, 2015

Commits on Apr 15, 2015

[backport] Fix misleading error message when using optional or repeatedly parser #34

Amal Elshihaby
authored and
gourlaysama
committed
Merge pull request #49 from gourlaysama/backports
gourlaysama
committed

Commits on Apr 22, 2015

move to scala 2.11.6 and sbt 0.13.8
gourlaysama
committed

Commits on Apr 23, 2015

Merge pull request #50 from gourlaysama/bump-scala-version
gourlaysama
committed

Commits on Apr 30, 2015