Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2017-02-27 14:00:46 -08:00
13 changed files with 23 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.