Commit Graph

172 Commits

Author SHA1 Message Date
Masayuki Nakano
89c7bcdad0 Bug 857820 part.2 Drop <blink> support from editor r=ehsan 2013-04-14 19:11:07 +09:00
Ryan VanderMeulen
7b3c2a732d Merge m-c to inbound. 2013-04-13 08:04:05 -04:00
Ms2ger
b3380bd0d9 Bug 856629 - Part b: Implement ChildNode.remove(); r=bz 2013-04-13 09:08:47 +02:00
Ms2ger
686b88a347 Bug 856629 - Part a: Import a test for HTMLSelectElement.remove(); rs=volkmar 2013-04-13 09:06:49 +02:00
Ben Hearsum
b5d5319eca bug 859101: tar Cannot open: File or path name too long when for test_document.getElementsByName-newelements.html.json and test_script-IDL-event-htmlfor.html.json - shorten imported w3c tests. r=Ms2ger
--HG--
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/Makefile.in => dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in => dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
rename : dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build => dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/moz.build
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html.json => dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.html.json
rename : dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build => dom/imptests/failures/html/html/dom/documents/dta/moz.build
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-frameset-and-body.html.json => dom/imptests/failures/html/html/dom/documents/dta/test_document.body-getter-frameset-and-body.html.json
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml.json => dom/imptests/failures/html/html/dom/documents/dta/test_document.title-03.html.json
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml.json => dom/imptests/failures/html/html/dom/documents/dta/test_document.title-04.xhtml.json
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-06.html.json => dom/imptests/failures/html/html/dom/documents/dta/test_document.title-06.html.json
rename : dom/imptests/failures/html/html/dom/documents/dom-tree-accessors/test_document.title-07.html.json => dom/imptests/failures/html/html/dom/documents/dta/test_document.title-07.html.json
rename : dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/Makefile.in => dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
rename : dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build => dom/imptests/failures/html/html/obsolete/implreq/oeaaa/moz.build
rename : dom/imptests/failures/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html.json => dom/imptests/failures/html/html/obsolete/implreq/oeaaa/test_script-IDL-event-htmlfor.html.json
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/Makefile.in => dom/imptests/html/html/dom/documents/dta/Makefile.in
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/Makefile.in => dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build => dom/imptests/html/html/dom/documents/dta/doc.gEBN/moz.build
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-case.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-case.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-id.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-id.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-namespace.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-namespace.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-newelements.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-null-undef.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-null-undef.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-param.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.xhtml => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-param.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-same.html => dom/imptests/html/html/dom/documents/dta/doc.gEBN/test_doc.gEBN-same.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/moz.build => dom/imptests/html/html/dom/documents/dta/moz.build
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_Document.getElementsByClassName-null-undef.html => dom/imptests/html/html/dom/documents/dta/test_Document.getElementsByClassName-null-undef.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_Element.getElementsByClassName-null-undef.html => dom/imptests/html/html/dom/documents/dta/test_Element.getElementsByClassName-null-undef.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-body-and-frameset.html => dom/imptests/html/html/dom/documents/dta/test_document.body-getter-body-and-frameset.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-foreign-frameset.html => dom/imptests/html/html/dom/documents/dta/test_document.body-getter-foreign-frameset.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-getter-frameset-and-body.html => dom/imptests/html/html/dom/documents/dta/test_document.body-getter-frameset-and-body.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.body-setter-01.html => dom/imptests/html/html/dom/documents/dta/test_document.body-setter-01.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.embeds-document.plugins-01.html => dom/imptests/html/html/dom/documents/dta/test_document.embeds-document.plugins-01.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.getElementsByClassName-same.html => dom/imptests/html/html/dom/documents/dta/test_document.getElementsByClassName-same.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.head-01.html => dom/imptests/html/html/dom/documents/dta/test_document.head-01.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.head-02.html => dom/imptests/html/html/dom/documents/dta/test_document.head-02.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-01.html => dom/imptests/html/html/dom/documents/dta/test_document.title-01.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-02.xhtml => dom/imptests/html/html/dom/documents/dta/test_document.title-02.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-03.html => dom/imptests/html/html/dom/documents/dta/test_document.title-03.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml => dom/imptests/html/html/dom/documents/dta/test_document.title-04.xhtml
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-05.html => dom/imptests/html/html/dom/documents/dta/test_document.title-05.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-06.html => dom/imptests/html/html/dom/documents/dta/test_document.title-06.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_document.title-07.html => dom/imptests/html/html/dom/documents/dta/test_document.title-07.html
rename : dom/imptests/html/html/dom/documents/dom-tree-accessors/test_nameditem-01.html => dom/imptests/html/html/dom/documents/dta/test_nameditem-01.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/Makefile.in => dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/moz.build => dom/imptests/html/html/obsolete/implreq/oeaaa/moz.build
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-01.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-01.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-02.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-02.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-03.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-03.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-04.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_document-color-04.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_heading-obsolete-attributes-01.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_heading-obsolete-attributes-01.html
rename : dom/imptests/html/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html => dom/imptests/html/html/obsolete/implreq/oeaaa/test_script-IDL-event-htmlfor.html
2013-04-12 14:35:15 -04:00
Boris Zbarsky
3722421ee7 Bug 860591. Install WebIDL quickstubs for event interfaces as needed. r=smaug 2013-04-12 10:51:25 -04:00
Andrea Marchesini
3d17116fda Bug 851470 - Attr to WebIDL. r=Ms2ger 2013-04-09 17:29:47 +02:00
Aryeh Gregor
53c6d9faf8 Bug 851916 part 2 - createHTMLDocument() should work with no arguments; r=bz 2013-03-21 14:55:08 +02:00
Aryeh Gregor
5384d0b989 Bug 851916 part 1 - Update dom/imptests/webapps/ and harness; r=Ms2ger
--HG--
rename : dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_ChildNode-remove.js => dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/ChildNode-remove.js
2013-03-21 14:54:43 +02:00
Ms2ger
a4c6c994b0 Bug 859075 - Attempt to make the test more robust. 2013-04-07 13:59:18 +02:00
Ryan VanderMeulen
0dff3575e0 Backed out changesets 715fce49a07b and abbc05319449 (bug 851916) for B2G mochitest-2 orange.
--HG--
rename : dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/ChildNode-remove.js => dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_ChildNode-remove.js
2013-04-04 12:02:50 -04:00
Ms2ger
97ae827742 Merge m-c to m-i. 2013-04-04 14:15:56 +02:00
Ms2ger
5ed305dd22 Bug 854329 - Part b: Import more tests; rs=mounir 2013-04-04 09:04:24 +02:00
Ms2ger
529b339870 Bug 854329 - Part a: Import more tests; rs=mounir 2013-04-04 09:04:00 +02:00
Ms2ger
0d61f56f03 No bug - Correct reference to importTestSuites.py in comments in generated moz.build files. 2013-04-04 09:03:55 +02:00
Aryeh Gregor
870eab27c7 Bug 851916 part 2 - createHTMLDocument() should work with no arguments; r=bz 2013-03-21 14:55:08 +02:00
Aryeh Gregor
ec0f1b2bb3 Bug 851916 part 1 - Update dom/imptests/webapps/ and harness; r=Ms2ger
--HG--
rename : dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_ChildNode-remove.js => dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/ChildNode-remove.js
2013-03-21 14:54:43 +02:00
Aryeh Gregor
d12e63e14f Bug 853449 - Dispatching an event that's already being dispatched should throw InvalidStateError; r=smaug 2013-04-02 17:10:45 +03:00
Boris Zbarsky
2cb912c299 Bug 856752. Reinstate Node.hasAttributes. r=khuey 2013-04-02 00:04:19 -04:00
Kyle Machulis
72a717a860 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Kyle Machulis
43628a7867 Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
334c0800cf Bug 855465 - Add emacs python mode comments to moz.build files; r=gps
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
2013-03-29 13:56:18 -07:00
Boris Zbarsky
6020a94656 Bug 855025. Always do Xrays for DOM interface objects. r=peterv 2013-03-27 22:47:25 -04:00
Boris Zbarsky
24422ccd0d Bug 848332 part 2. Switch XMLDocument to WebIDL. r=peterv 2013-03-26 11:31:54 -04:00
Aryeh Gregor
b4a520d2b8 Bug 849661 - Remove support for Node.hasAttributes(); r=bz 2013-03-21 14:48:32 +02:00
Aryeh Gregor
32798624fe Bug 852115 - initEvent should unset defaultPrevented; r=smaug 2013-03-20 16:15:58 +02:00
Gregory Szorc
89e86f9b21 Bug 844654 - Part 3: Remove now empty Makefile.in files; rs=khuey
--HG--
extra : rebase_source : 8de9c7f68a953e574dda22f8c14c2b2ca60444f9
2013-03-19 18:49:07 -07:00
Ms2ger
4ec472b450 Bug 844134 - Move the 'attributes' property from Node to Element; r=sicking 2013-03-17 09:51:34 +01:00
Aryeh Gregor
07f1711dbc Bug 801562 - Remove Node.isSupported; r=bz
--HG--
rename : content/svg/content/test/test_isSupported.xhtml => content/svg/content/test/test_hasFeature.xhtml
2013-03-15 12:21:52 +02:00
Trevor Saunders
585a307b78 bug 825341 - convert range to webidl r=bz, smaug 2013-02-07 07:09:41 -05:00
Phil Ringnalda
97983b5f15 Back out fee79a593fd3 and 2c8930343985 (bug 825341) for having probably needed-clobber 2013-03-11 20:10:18 -07:00
Trevor Saunders
bcb6f556e0 bug 825341 - convert range to webidl r=bz, smaug 2013-02-07 07:09:41 -05:00
Ms2ger
89fffd12a6 Bug 847195 - Make NamedNodeMap only deal with Attrs; r=khuey
--HG--
rename : dom/interfaces/core/nsIDOMNamedNodeMap.idl => dom/interfaces/core/nsIDOMMozNamedAttrMap.idl
2013-03-10 09:00:33 +01:00
Ms2ger
161a2d489e Bug 802560 - Handle the second argument to DOMImplementation.createDocument correctly; r=bz 2013-03-10 08:58:42 +01:00
Olli Pettay
eaf67cc919 Bug 822399 - Make Event to use Paris bindings, r=peterv 2013-03-09 13:34:29 +02:00
Boris Zbarsky
8cfff048ee Bug 776536 part 4. Turn on WebIDL bindings for NodeIterator and TreeWalker. r=peterv
The behavior here is a bit weird because Document is still not a
WebIDL object, so calling createNodeIterator or createTreeWalker via
an Xray will call the XPCOM versions of those methods.  That means
that I can't just disable XPCOM-based wrapping for TreeWalker and
NodeIterator altogether, unfortunately, which means a web page could
try stashing a TreeWalker in something like userdata and then getting
it back and end up wrapping it as an XPCOM object the second time.

I could "fix" that by adding a wrapper cache and whatnot, I guess, if
desired...  But the problem will go away once we convert Document in
any case.
2013-02-28 12:56:42 -05:00
Ryan VanderMeulen
c952e87e03 Backed out 7 changesets (bug 832920, bug 776536, bug 843261) for mochitest-a11y assertions on a CLOSED TREE.
--HG--
rename : content/base/src/NodeIterator.cpp => content/base/src/nsNodeIterator.cpp
rename : content/base/src/NodeIterator.h => content/base/src/nsNodeIterator.h
rename : content/base/src/TreeWalker.cpp => content/base/src/nsTreeWalker.cpp
rename : content/base/src/TreeWalker.h => content/base/src/nsTreeWalker.h
2013-02-28 14:41:30 -05:00
Boris Zbarsky
08d376c598 Bug 776536 part 4. Turn on WebIDL bindings for NodeIterator and TreeWalker. r=peterv
The behavior here is a bit weird because Document is still not a
WebIDL object, so calling createNodeIterator or createTreeWalker via
an Xray will call the XPCOM versions of those methods.  That means
that I can't just disable XPCOM-based wrapping for TreeWalker and
NodeIterator altogether, unfortunately, which means a web page could
try stashing a TreeWalker in something like userdata and then getting
it back and end up wrapping it as an XPCOM object the second time.

I could "fix" that by adding a wrapper cache and whatnot, I guess, if
desired...  But the problem will go away once we convert Document in
any case.
2013-02-28 12:56:42 -05:00
Ms2ger
a01f04340f Bug 784841 - Part 18j: Convert dom/imptests with parseFailures.py output; rs=gps 2013-02-25 12:47:19 -08:00
Ms2ger
77ad7ecf33 Bug 784841 - Part 18i: Convert dom/imptests with importTestsuite.py output; rs=gps 2013-02-25 12:47:19 -08:00
Gregory Szorc
4479cef096 Bug 784841 - Part 15: Produce moz.build files for dom imported tests; r=Ms2ger
--HG--
rename : dom/imptests/writeMakefile.py => dom/imptests/writeBuildFiles.py
2013-02-25 12:46:50 -08:00
David Humphrey (:humph)
3de3f07473 Bug 629801 Implement HTML5 <time> element. r=smaug, peterv, hsivonen 2013-02-22 10:07:42 -05:00
Ryan VanderMeulen
b30facb288 Backed out 6 changesets (bug 832920, bug 825341, bug 838582, bug 842726, bug 629801, bug 842561) for Linux32 debug mochitest-2 and Windows/OSX mochitest-browser-chrome failures on a CLOSED TREE. 2013-02-22 15:30:06 -05:00
Ryan VanderMeulen
7fb17435cb Merge m-c to inbound. 2013-02-22 12:45:21 -05:00
Gregory Szorc
52044bbd9d Bug 784841 - Part 14: Use 4-space indent on Python scripts in dom/imptests; rs=Ms2ger 2013-02-21 10:56:48 -08:00
David Humphrey (:humph)
5c015b3fea Bug 629801 Implement HTML5 <time> element. r=smaug, peterv, hsivonen 2013-02-22 10:07:42 -05:00
Trevor Saunders
1b867cc29f bug 825341 - convert range to webidl r=bz, smaug 2013-02-07 07:09:41 -05:00
Ms2ger
d291f8365c Bug 838088 - Update html tests; rs=mounir
--HG--
rename : dom/imptests/failures/html/tests/submission/Opera/microdata/Makefile.in => dom/imptests/failures/html/old-tests/submission/Opera/microdata/Makefile.in
rename : dom/imptests/failures/html/tests/submission/Opera/microdata/test_001.html.json => dom/imptests/failures/html/old-tests/submission/Opera/microdata/test_001.html.json
rename : dom/imptests/html/tests/submission/Mozilla/test_pageload-image.html => dom/imptests/html/html/browsers/browsing-the-web/read-media/test_pageload-image.html
rename : dom/imptests/html/tests/submission/Mozilla/test_pageload-video.html => dom/imptests/html/html/browsers/browsing-the-web/read-media/test_pageload-video.html
rename : dom/imptests/html/tests/submission/Mozilla/test_script-for-onload.html => dom/imptests/html/html/semantics/scripting-1/the-script-element/test_script-for-onload.html
rename : dom/imptests/html/tests/submission/Mozilla/test_body-onload.html => dom/imptests/html/html/webappapis/scripting/events/test_body-onload.html
rename : dom/imptests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html => dom/imptests/html/html/webappapis/scripting/processing-model-2/test_window-onerror-parse-error.html
rename : dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html => dom/imptests/html/html/webappapis/scripting/processing-model-2/test_window-onerror-runtime-error-throw.html
rename : dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html => dom/imptests/html/html/webappapis/scripting/processing-model-2/test_window-onerror-runtime-error.html
rename : dom/imptests/html/tests/submission/Opera/microdata/Makefile.in => dom/imptests/html/old-tests/submission/Opera/microdata/Makefile.in
rename : dom/imptests/html/tests/submission/Opera/microdata/test_001.html => dom/imptests/html/old-tests/submission/Opera/microdata/test_001.html
2013-02-12 10:54:30 +01:00
Ms2ger
3d5702ea2e No bug - Remove windows line endings from Opera's microdata test in preparation for an update. 2013-02-12 10:53:21 +01:00
Alexandre Poirot
2118fd0622 Bug 821695 - Do not load videocontrols.xml if the audio/video tag does not need it. r=roc
--HG--
extra : rebase_source : 567194ec6ee1862af1d7988aa9a0c3b50f07788a
2013-02-01 08:47:55 -05:00