slick/slick — pull request #828 by cvogt (2014-05-27 12:28:08+00:00)
Title: merge 2.0 branch into master

no review