html5/2dcontext Overview.html,1.135,1.136

Update of /sources/public/html5/2dcontext
In directory hutz:/tmp/cvs-serv14700

Modified Files:
	Overview.html 
Log Message:
commit f0155ee03ad74e25eeb0beb8b185d2b60a800ce0
Merge: 868fd12 37b3183
Author: Tom Wiltzius <tom.wiltzius@gmail.com>
Date:   Thu Aug 23 11:49:28 2012 -0700

    Merge branch 'master' of https://github.com/w3c/html


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/2dcontext/Overview.html,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- Overview.html	23 Aug 2012 18:13:49 -0000	1.135
+++ Overview.html	23 Aug 2012 19:14:16 -0000	1.136
@@ -378,7 +378,10 @@
     <dd><a href=http://www.w3.org/TR/2008/WD-html5-20080610/>http://www.w3.org/TR/2008/WD-html5-20080610/</a></dd>
     <dd><a href=http://www.w3.org/TR/2008/WD-html5-20080122/>http://www.w3.org/TR/2008/WD-html5-20080122/</a></dd>
     <dt>Editor:</dt>
-    <dd><a href=mailto:ian@hixie.ch>Ian Hickson</a>, Google, Inc.</dd>
+    <dd><a href=mailto:cabanier@adobe.com>Rik Cabanier</a>, Adobe Systems, Inc.</dd>
+    <dd><a href=mailto:eliot.graff@microsoft.com>Eliot Graff</a>, Microsoft Corporation</dd>
+    <dd><a href=mailto:jaymunro@microsoft.com>Jay Munro</a>, Microsoft Corporation</dd>
+    <dd><a href=mailto:wiltzius@google.com>Tom Wiltzius</a>, Google, Inc.</dd>
    </dl><p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a>
    © 2012 <a href=http://www.w3.org/><abbr title="World Wide
    Web Consortium">W3C</abbr></a><sup>®</sup> (<a href=http://www.csail.mit.edu/><abbr title="Massachusetts

Received on Thursday, 23 August 2012 19:14:19 UTC