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
..
notes	Convert references to harrah/xsbt to sbt/sbt	2013-01-04 17:22:40 -05:00
src	Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5	2014-05-16 14:04:51 -04:00