Merge branch '1.1.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java

@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -66,6 +67,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Inherited
 @Import({ EnableAutoConfigurationImportSelector.class,
 		AutoConfigurationPackages.Registrar.class })
 public @interface EnableAutoConfiguration {