Merge branch 'master' into windows

Conflicts: mrbgem.rake
iij · mattn · Jan 11, 2013 · Jan 24, 2013 · Jan 24, 2013 · Jan 24, 2013
commit 39dbe600676b6b4e74e1cb463997c6441aea9527
diff --git a/mrbgem.rake b/mrbgem.rake
@@ -2,5 +2,5 @@ MRuby::Gem::Specification.new('mruby-process') do |spec|
   spec.license = 'MIT'
   spec.authors = 'mruby developers'
 
-  spec.cc.include_paths << ["#{build.root}/src"]
+  spec.cc.include_paths << "#{build.root}/src"
 end