Merge branch '0.13' of github.com:jedesah/sbt into 0.13

Conflicts:
	ivy/src/main/scala/sbt/IvyInterface.scala
This commit is contained in:
Jean-Rémi Desjardins 2014-09-16 09:29:35 -07:00
commit a3ba82c645

Diff Content Not Available