Merge branch '1.0.x'

8acd6fc7 · Phillip Webb · a3c359ab · 42be7aba · 8acd6fc7
Commit 8acd6fc7 authored May 23, 2014 by Phillip Webb
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

PropertySourcesLoader.java ...a/org/springframework/boot/env/PropertySourcesLoader.java +1 -1

No files found.
--- a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

 /**
- * Utiltiy that can be used to {@link MutablePropertySources} using
+ * Utility that can be used to {@link MutablePropertySources} using
 * {@link PropertySourceLoader}s.
 * 
 * @author Phillip Webb