Josh Suereth 7d0b517be2 Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5 ... Conflicts: main/src/main/scala/sbt/Load.scala		2014-05-16 14:04:51 -04:00
..
main/scala/sbt	Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5	2014-05-16 14:04:51 -04:00
test/scala	Bump expected 2.11 module versions so we can compile with 2.11	2014-05-14 19:08:05 -04:00