republish
Merge branch 'master' of github.com:jinntrance/douban-scala

Conflicts:
	build.sbt
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-javadoc.jar
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-javadoc.jar.md5
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-javadoc.jar.sha1
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-sources.jar
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-sources.jar.md5
	repo/releases/com/douban/scala-api_2.10/2.0/scala-api_2.10-2.0-sources.jar.sha1