uryyyyyyy/play2-spa-scala — pull request #3 by uryyyyyyy (2014-09-10 14:30:43+00:00)
Title:  Merge remote-tracking branch 'origin/s3' into s3

Conflicts:
build.sbt