merge in fixes from stable

2015-09-17 13:53:43 -07:00 · 2015-09-17 13:53:43 -07:00 · fdabd87957
commit fdabd87957
parent 409a892da7 8a349322ac
91 changed files with 2859 additions and 285 deletions
--- a/middleman-core/lib/middleman-core/sources.rb
+++ b/middleman-core/lib/middleman-core/sources.rb
@ -1,6 +1,5 @@
 require 'hamster'
 require 'middleman-core/contracts'
-require 'backports/2.0.0/enumerable/lazy'

 module Middleman
  # The standard "record" that contains information about a file on disk.