Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129

Conflicts:
	build.number
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/library/scala/collection/Iterator.scala
	versions.properties

1 files changed, 0 insertions, 15 deletions

diff --git a/test/files/run/iterator-concat.scala b/test/files/run/iterator-concat.scala
deleted file mode 100644
index f11363410f..0000000000
--- a/test/files/run/iterator-concat.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-object Test {
-  // Create `size` Function0s, each of which evaluates to an Iterator
-  // which produces 1. Then fold them over ++ to get a single iterator,
-  // which should sum to "size".
-  def mk(size: Int): Iterator[Int] = {
-    val closures = (1 to size).toList.map(x => (() => Iterator(1)))
-    closures.foldLeft(Iterator.empty: Iterator[Int])((res, f) => res ++ f())
-  }
-  def main(args: Array[String]): Unit = {
-    println(mk(100).sum)
-    println(mk(1000).sum)
-    println(mk(10000).sum)
-    println(mk(100000).sum)
-  }
-}