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

This commit is contained in:
bors 2015-07-13 16:31:05 +00:00
commit 0fbcebaaec

@ -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>