Merge branch 'master' into proposed/3.0.0

This commit is contained in:
2016-02-02 02:35:16 -05:00
+1 -1
View File
@@ -1,4 +1,4 @@
Copyright 2015 Kenneth Reitz
Copyright 2016 Kenneth Reitz
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.