Merge branch 'master' into derekd-ui-escape-chars

sunlzx · Feb 26, 2013 · a8ecc98 · a8ecc98
2 parents aa88f98 + b1f08b4
commit a8ecc98
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,7 @@
 Storm
 Copyright 2011-2013 Nathan Marz
 
+This product includes software developed by Yahoo! Inc. (www.yahoo.com)
+Copyright © 2012-2013 Yahoo! Inc.  All rights reserved.
+