Auto merge of #27001 - tsion:patch-2, r=Gankro

bors · bors · commit 0fbcebaaec51 · 2015-07-13T16:31:05.000Z
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -958,7 +958,7 @@ Santiago Rodriguez <sanrodari@gmail.com>
 Saurabh Anand <saurabhanandiit@gmail.com>
 Scott Jenkins <scottdjwales@gmail.com>
 Scott Lawrence <bytbox@gmail.com>
-Scott Olson <scott@scott-olson.org>
+Scott Olson <scott@solson.me>
 Sean Bowe <ewillbefull@gmail.com>
 Sean Chalmers <sclhiannan@gmail.com>
 Sean Collins <sean@cllns.com>

-Original file line number
+Diff line change
 Saurabh Anand <[email protected]>
 Scott Jenkins <[email protected]>
 Scott Lawrence <[email protected]>
 -Scott Olson <scott@scott-olson.org>
 +Scott Olson <scott@solson.me>
 Sean Bowe <[email protected]>
 Sean Chalmers <[email protected]>
 Sean Collins <[email protected]>