Permalink
Browse files

Merge branch 'github_master'

Conflicts:
	project/Build.scala
  • Loading branch information...
Stephan Zuercher
Stephan Zuercher committed Jul 16, 2012
2 parents b4e6efe + 529354a commit fd7a30977bd17d794344e56740ea30478c723e18
Showing with 0 additions and 0 deletions.

0 comments on commit fd7a309

Please sign in to comment.