wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
178,483 Commits 1 Branch 166 Tags 1.2 GiB
1d7f94aeb5
Commit Graph

552 Commits

Author SHA1 Message Date
Wes Kocher
c384670002 merge inbound to m-c 2013-12-17 21:00:02 -08:00
Mike Conley
514cedfba2 Bug 944147 - [Australis] Collect UITelemetry on bookmark star usage. r=jaws. 2013-12-17 23:57:36 -05:00
Mike Conley
1a6dd4e0d8 Bug 944049 - [Australis] Collect UITelemetry on bookmarks toolbar usage. r=jaws. 2013-12-17 17:00:13 -05:00
Shane Caraveo
1105be2d52 bug 940155 make marks button work in Australis menu panel, r=markh 2013-12-16 21:24:44 -08:00
Shane Caraveo
259854280f bug 914921 make status button work in Australis menu panel, r=markh 2013-12-16 21:21:17 -08:00
Gijs Kruitbosch
3c4faf6777 Bug 950334 - Australis' (un)registerWindow methods in BrowserUITelemetry assume areaNode exists, r=mconley 2013-12-16 11:28:38 +00:00
Matthew Noorenberghe
ff524a7fc1 Bug 949380 - [Australis] Add @hidden=true initially to UITour panels. r=Unfocused 2013-12-13 23:54:04 +13:00
Bill McCloskey
56351ad02f Bug 673569 - Let each frame script have its own anonymous scope (r=smaug,Waldo,mrbkap,bsmedberg) 2013-11-23 21:32:45 -08:00
Katie Thomas
1977346916 Bug 891194 - Changed BROKEN_WM_Z_ORDER to not be defined for mac. r=dao 
--HG--
extra : rebase_source : 0947d2d97f3aa4d4707215f0d9bf90ba6f508b59
 2013-12-12 12:48:41 +01:00
Dão Gottwald
83144ecfdc Backed out changeset 9f7da731bf06 (CLOSED TREE) 2013-12-12 12:38:34 +01:00
Katie Thomas
796a579b34 Bug 891194 - Changed BROKEN_WM_Z_ORDER to not be defined for mac. r=dao 2013-12-12 09:58:28 +01:00
Matthew Noorenberghe
ec5085263d Bug 936273 - [Australis] UITour: Allow page to specify which highlight animation to use. r=Unfocused 2013-12-10 23:35:31 -08:00
Matthew Noorenberghe
e93dd15e9e Bug 948807 - [Australis] UITour: Fix highlight position and clipping when a dimension is smaller than the minimum. r=Unfocused 2013-12-10 23:35:31 -08:00
Matthew Noorenberghe
4705c7d9c1 Bug 936187 - [Australis] UITour: Switch highlight to a <panel> so it overlays the menu panel. r=Unfocused 2013-12-10 23:35:20 -08:00
Matthew Noorenberghe
c394b728fc Bug 936187 - [Australis] UITour: Make the menu panel work except the z-order of annotations. r=Unfocused 2013-12-10 23:35:11 -08:00
Mike Conley
ea23125e0e Bug 944114 [Australis] follow-up - pass MouseEvent.button instead of the MouseEvent to _countMouseUpEvent. r=me. 2013-12-10 18:26:37 -05:00
Mike Conley
68a033ffcf Backed out changeset c083d7a68fd2 due to missing Australis in commit message. 2013-12-10 18:44:51 -05:00
Mike Conley
eb99869bcd Bug 944114 follow-up - pass MouseEvent.button instead of the MouseEvent to _countMouseUpEvent. r=me. 2013-12-10 18:26:37 -05:00
Mike Conley
83a28bedbe Bug 944114 - [Australis] Add telemetry probe for usage of 'Metro Mode' and 'Fullscreen' Australis default buttons. r=Gijs. 2013-12-10 14:49:24 -05:00
Mike Conley
0047869f02 Bug 942244 - [Australis] Add BrowserUiTelemetry module for collecting toolbar measurements. r=dao. 2013-12-10 14:49:02 -05:00
Mark Hammond
3026c09b74 Bug 948167 - move final test from browser/modules/test/Makefile.in to browser.ini. r=ted 
Conflicts:
	browser/modules/test/browser.ini
 2013-12-10 11:43:59 +11:00
Henri Sivonen
7ab1f605e5 Bug 946676 - Remove iso-8859-8-i from the Character Encoding menu. r=emk. 2013-12-05 15:23:13 +02:00
Mark Hammond
1311ef3c1a no bug - add trailing line to test manifest. r=me, DONTBUILD 2013-12-05 16:05:08 +11:00
Ryan VanderMeulen
26e1b97fc1 Backed out changeset 4d07001e9afc (bug 673569) because it depends on bug 682048 which is being backed out. 2013-12-03 22:43:52 -05:00
Bill McCloskey
39f6db2e10 Bug 673569 - Let each frame script have its own anonymous scope (r=smaug,Waldo,mrbkap,bsmedberg) 2013-11-23 21:32:45 -08:00
Carsten "Tomcat" Book
47f8b38937 Merge m-c to fx-team 2013-11-28 14:35:04 +01:00
Carsten "Tomcat" Book
b011bd06cb merge fx-team to mozilla-central 2013-11-28 12:44:14 +01:00
Gijs Kruitbosch
033eee4687 Bug 943524 - fix charset and chardet processing to allow for unique IDs, r=jaws 2013-11-28 11:25:14 +01:00
Mike Hommey
9245936f8b Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-27 22:55:07 +09:00
Mike Hommey
2b828323f2 Backout changeset 3fd4b546eed4 (bug 874266) and changeset a35d2e3a872f (bug 942043) for ASAN build bustage and Windows test bustage 
--HG--
extra : amend_source : f20d09aeff1c8b5cbd0f1d24c7ce04e86f3aed1d
 2013-11-28 14:24:05 +09:00
Matthew Noorenberghe
80f6642a72 Bug 940902 - UITour: Add ability to hide a menu. r=Unfocused 2013-11-15 16:26:59 -08:00
Gijs Kruitbosch
bc546b0ddd Bug 943524 - fix issues in holly caused by bug 805374, r=jaws 2013-11-26 22:04:01 +01:00
Henri Sivonen
efd91c19ff Bug 805374 - Clean up the Character Encoding menu. r=Gijs,Unfocused. 2013-11-26 09:31:52 +02:00
Mike Hommey
d210f8ff00 Bug 874266 - Move all DEFINES that can be moved to moz.build. r=mshal 2013-11-28 13:08:16 +09:00
Gijs Kruitbosch
37ba637e69 Merge m-c to ux 2013-11-06 14:36:26 +01:00
Gijs Kruitbosch
c38e551bb3 Merge mozilla-central and ux 2013-11-06 09:01:08 +01:00
Gijs Kruitbosch
63530f7b09 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Gijs Kruitbosch
a13ed4741f Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Shane Caraveo
3ae066f41c Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh. 2013-10-31 10:59:35 +11:00
Richard Newman
96df1725af Merge m-c to s-c. 2013-10-28 17:51:05 -07:00
Richard Newman
72e1ff6dbd Bug 925521 - Part 2: correctly record identifiers for non-pre-installed engines. r=gps 
* * *
Bug 925521 - Review comments.
 2013-10-18 12:31:39 -07:00
Carsten "Tomcat" Book
40ca48c269 merge fx-team to mozilla-central 2013-10-18 11:40:53 +02:00
Drew Willcoxon
aa89292db1 Bug 910036 - about:newtab shouldn't load thumbnails in background when hidden by preloader. r=gavin 2013-10-30 19:33:02 -07:00
Bill McCloskey
1f0653b67a Bug 927132 - Fix about:home in e10s (r=mdeboer) 2013-10-25 14:14:55 -07:00
Mike Hommey
61124c1afc Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Matthew Noorenberghe
baccb13238 Bug 928579 - Backout bug 793906 to re-enable desktop Signin-to-Web UI. f=ozten,r=dolske 2013-10-22 21:01:33 -07:00
Fernando Jiménez
be4193d29b Bug 910466 - Refactor IPC app state updating. r=fabrice 2013-10-17 14:47:58 +02:00
Gavin Sharp
dd33c2bf63 Bug 925898: properly pass the "homepage" reason to getSubmission calls for about:home, r=MattN 
--HG--
extra : transplant_source : %10i%ADC%D2W%C0%C0%99LM%9AR%D3%09%B29%10%F1%25
 2013-10-11 15:00:11 -07:00
Blair McBride
6dcf3b0e82 Bug 933023 - UITour: Add preference to disable HTTPS check for testing/development. r=MattN 2013-11-05 15:23:25 +13:00
Ryan VanderMeulen
05d9f55e59 Backed out changesets cf64922197ca, 3ae60bdf3fef, and 68960c6bdce3 (bug 906839) for ASAN mochitest-bc perma-orange. 2013-11-04 15:54:55 -05:00
Shane Caraveo
545175ac54 Bug 906839 - enable by default social.allowMultipleWorkers - update tests to work pref'd on and fix a missing update to the worker state, r=markh. 2013-10-31 10:59:35 +11:00
Gijs Kruitbosch
ce93f74110 merge m-c to UX 2013-10-27 21:18:18 +01:00
Gijs Kruitbosch
169105946a Merge mozilla-central and ux 2013-10-24 10:18:26 +02:00
Gijs Kruitbosch
ce4da8edb8 Merge mozilla-central and ux 2013-10-23 15:41:02 +02:00
Blair McBride
83517fcb51 Bug 862998 - Make UITour compatible with Australis, r=dolske 2013-09-17 03:55:00 +02:00
Gijs Kruitbosch
a6148ebc99 Merge m-c to UX 2013-10-18 12:56:16 +02:00
Gijs Kruitbosch
19083f9692 Merge mozilla-central and ux 2013-10-17 13:48:43 +02:00
Gijs Kruitbosch
c18d784b3c Merge m-c to ux 2013-10-03 17:20:04 +02:00
Ms2ger
105ce73cfa Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Gijs Kruitbosch
5d3ed7cf58 Merge m-c to UX 2013-10-01 00:36:26 +02:00
Gregory Szorc
b03f79a7e6 Bug 920223 - Part 3: Mass convert MOCHITEST_BROWSER_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:06 +02:00
Gregory Szorc
cc1da2c22a Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gijs Kruitbosch
495e7495d1 Merge mozilla-central and ux 2013-09-26 10:26:16 +02:00
Ed Morley
038cae0901 Backed out changeset 68b6b152f51a (bug 920223) 2013-09-30 12:50:09 +01:00
Ed Morley
eccf636a23 Backed out changeset 8b02873ee07e (bug 920223) 2013-09-30 12:50:05 +01:00
Gregory Szorc
e4af98efbf Bug 920223 - Part 3: Mass convert MOCHITEST_BROWSER_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:06 +02:00
Gregory Szorc
483a776413 Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gijs Kruitbosch
a3a29ecf94 Merge mozilla-central and ux 2013-09-25 10:16:54 +02:00
Wes Kocher
8136df6573 Merge inbound to m-c 2013-09-24 19:41:44 -07:00
Felipe Gomes
0124ac8bb1 Bug 916667 - about:tabcrashed fails to display for pages with no title. r=markh,glandium 2013-09-24 00:47:57 -03:00
Gregory Szorc
ed68c2482b Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted 
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
 2013-09-24 11:50:08 -07:00
Gijs Kruitbosch
8ed9c0d44e Merge mozilla-central and ux 2013-09-21 13:14:05 +02:00
Gijs Kruitbosch
d52551e57b Merge mozilla-central and ux 2013-09-20 11:54:02 +02:00
Shane Caraveo
a935dab91b bug 914926 fix workers on startup when social disabled, r=markh 2013-09-19 10:25:08 -07:00
Gijs Kruitbosch
240869fd9c Merge mozilla-central and ux 2013-09-17 11:58:14 +02:00
Phil Ringnalda
f0214b2243 Merge m-i to a CLOSED TREE m-c 2013-09-16 23:12:03 -07:00
Phil Ringnalda
536b3fda4b Backed out changeset acce93fb65a1 (bug 914926) 
CLOSED TREE
 2013-09-16 17:55:08 -07:00
Shane Caraveo
85c5e3cfd9 Bug 914926 - Fix workers on startup when social disabled. r=markh 
CLOSED TREE
 2013-09-14 10:16:47 -07:00
Ryan VanderMeulen
b9909df9cb Speculatively backout changeset bc8d1b9545c5 (bug 914926) on suspicion of causing intermittent Windows XP debug mochitest-bc crashes. 
CLOSED TREE
 2013-09-16 16:53:54 -04:00
Ryan VanderMeulen
edea7c14c7 Merge inbound to m-c. 2013-09-15 21:48:02 -04:00
Ryan VanderMeulen
f1c45fb9f7 Backed out changesets bc4ee7cbd7bd and cf373e408a6b (bug 882145) for causing bug 916609. r=jsmith 2013-09-15 18:19:42 -04:00
Marco Castelluccio
c3504e75c1 Bug 914857 - Stop showing the progress if an error during the installation occurs. r=felipe 2013-09-15 12:45:02 -03:00
Ryan VanderMeulen
e757b0b4fb Merge m-c to inbound. 2013-09-14 20:31:22 -04:00
Shane Caraveo
2792780d35 bug 914926 fix workers on startup when social disabled, r=markh 2013-09-14 10:16:47 -07:00
Wes Kocher
9fc010fdbc Merge inbound to m-c 2013-09-13 18:14:32 -07:00
Boris Zbarsky
9e605eea62 Bug 913855. Fix consumers of window mediator to be more consistent in their checking for closed windows. r=dolske 
Note that we can't just stop returning closed windows from the window
mediator, because some consumers (e.g. session restore) rely on seeing
closed windows in the list so they can remove them from their internal
data structures expeditiouly.
 2013-09-13 17:29:51 -04:00
Ryan VanderMeulen
2e3e16ce15 Merge m-c to b2g-inbound. 2013-09-13 16:11:28 -04:00
Ed Morley
2bd0ccf7b6 Merge mozilla-central and b2g-inbound 2013-09-13 15:14:11 +01:00
Marco Castelluccio
8ce18edaff Bug 905881 - Move the package to the local installation directory. r=fabrice, r=myk 2013-09-13 08:32:47 -04:00
Gijs Kruitbosch
aab9d2b53f Merge mozilla-central and ux 2013-09-16 09:13:50 +02:00
Randell Jesup
b9b7fe21d3 Bug 882145: reland changesets bc4ee7cbd7bd and cf373e408a6b r=bz 2013-09-16 02:34:57 -04:00
Gijs Kruitbosch
f55435100e Merge m-c to ux 2013-09-15 19:30:19 +02:00
Gijs Kruitbosch
eb7352abc3 Merge mozilla-central and ux 2013-09-10 16:46:22 +02:00
Marco Castelluccio
69189031fe Bug 899353 - Show progress while installing apps. r=felipc 2013-09-09 08:57:37 -04:00
Matthew Noorenberghe
1f8ae35067 Merge mozilla-central to UX 2013-09-06 17:54:20 -07:00
Shane Caraveo
668a8f74a1 bug 891219 new social bookmarks, part 2, new implementation, r=markh 2013-09-06 10:56:01 -07:00
Mike Conley
717a6d0cec Automated merge with https://hg.mozilla.org/mozilla-central 2013-09-05 09:59:00 -04:00
Matthew Noorenberghe
a0cabb6051 Merge mozilla-central to UX 2013-09-04 23:31:53 -07:00
Matthew Noorenberghe
8a8f2a6778 Merge mozilla-central to UX 2013-08-30 22:20:31 -07:00
Shane Caraveo
17d2b6a41e bug 906212 fix socialapi ui startup regressions, r=markh 2013-08-30 11:11:20 -07:00
Mike de Boer
6d805dd6c8 Bug 900865: Make about:home call nsISearchEngine.getSubmission for all searches. r=gavin 2013-08-30 18:20:22 +02:00
Gijs Kruitbosch
e27ae39c3e Merge mozilla-central and ux 2013-08-29 23:55:09 +02:00
Gijs Kruitbosch
9ffae9f766 Merge mozilla-central and ux 2013-08-29 15:30:00 +02:00
Ryan VanderMeulen
36f07cefce Backed out changeset a7a66112a560 (bug 900865) for mochitest-bc crashes. 2013-08-28 16:50:53 -04:00
Gijs Kruitbosch
17fded927d Merge m-c to UX. 2013-08-28 22:31:31 +02:00
Mike de Boer
1ba5de0bdb Bug 900865 - Make about:home call nsISearchEngine.getSubmission for all searches. r=gavin 2013-08-28 13:36:48 +02:00
Marco Castelluccio
d5b69fb4d1 Bug 910256 - Check if this.downloads[data.manifest] is defined before using it. r=felipc 2013-08-28 15:35:35 -04:00
Marco Castelluccio
9179b12161 Bug 836547 - Remove obsolete AITC integration in Webapps.jsm. r=fabrice 2013-08-27 23:40:16 -04:00
Gijs Kruitbosch
c18fceb6c7 Merge m-c to UX. 2013-08-28 09:48:19 +02:00
Gijs Kruitbosch
39b78f93c6 Merge m-c to UX 2013-08-27 11:23:22 +02:00
Shane Caraveo
cc3d72f7c4 bug 847124, bug 886300 intermittent blocklist failures 2013-08-27 09:18:35 -07:00
Wes Kocher
8bba56d03f Merge m-c to inbound 2013-09-04 18:04:50 -07:00
Mike Hommey
f1cf3b4238 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Ed Morley
19e398d030 Merge mozilla-central and inbound 2013-09-20 10:55:03 +01:00
Honza Bambas
ea8ec4777e Bug 913807 - HTTP cache v2: API+top service+integration+tests, off by default, r=michal+ehsan+mark.finkle+fabrice+mhammond+gavin 2013-09-20 11:11:25 +02:00
Marco Castelluccio
206818581b Bug 747552 - During webapp install, icon retrieval may return non-image files. r=myk 2013-08-26 15:04:33 -04:00
Ryan VanderMeulen
709f8a57a1 Backed out 4 changesets (bug 747428, bug 907324, bug 899353, bug 747552) for mochitest-other assertions. 
Backed out changeset ee2bf84036fb (bug 907324)
Backed out changeset 17f932a5856d (bug 899353)
Backed out changeset b277e7b08f88 (bug 747552)
Backed out changeset 6ae3b1195542 (bug 747428)
 2013-08-26 12:25:49 -04:00
Shane Caraveo
901fcbd69e bug 905297 fix error page handling for social panels, r=markh 2013-08-26 08:58:15 -07:00
Marco Castelluccio
06694c646e Bug 899353 - Show progress while downloading webapps. r=felipc 2013-08-26 10:32:09 -04:00
Marco Castelluccio
6248cb3409 Bug 747552 - During webapp install, icon retrieval may return non-image files. r=myk 2013-08-26 10:31:49 -04:00
Marco Castelluccio
78aa55ada4 Bug 910391 - Remove offline cache observer parameter from confirmInstall. r=fabrice 2013-08-29 10:00:33 -04:00
Marco Castelluccio
e779a2364d Bug 909512 - Wait appcache download before showing the installation notification. r=felipc 2013-08-27 08:50:22 -04:00
Shane Caraveo
dafd27215e bug 891225 implement new provider status buttons, r=markh 2013-09-04 10:01:38 -07:00
Gijs Kruitbosch
0b4bb84c4a Merge m-c to ux 2013-08-22 00:07:23 +02:00
Shane Caraveo
f562440456 bug 891216 multiple workers enabled, r=markh 2013-08-21 11:32:46 -07:00
Gijs Kruitbosch
0096a5d012 Merge m-c to ux 2013-08-20 11:00:57 +02:00
Mike Conley
b90dcf2b62 Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-15 10:54:32 -04:00
Mike Conley
f9fd232851 Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-13 10:12:56 -04:00
Mike Conley
104ab62e44 Automated merge with https://hg.mozilla.org/mozilla-central 2013-08-09 19:24:40 -04:00
Ryan VanderMeulen
8afe7e8fed Merge inbound to m-c. 2013-08-09 19:08:45 -04:00
Ryan VanderMeulen
1c27efb8bd Merge b2g-inbound to m-c. 2013-08-09 17:26:14 -04:00
Tim Taubert
489d2788bd Bug 904616 - Ensure that sizes for preload browsers are applied correctly; r=jaws 2013-08-14 06:59:49 +02:00
Gijs Kruitbosch
f6ec1e3db6 Merge m-c to UX 2013-08-07 21:09:10 +02:00
Tim Taubert
a04de08ea0 Bug 888972 - part 2 - Load pending frame scripts and discard browser after swapping; r=gavin 2013-08-09 04:37:03 +02:00
Matthew Noorenberghe
d82aa86989 Merge mozilla-central to UX 2013-08-05 23:17:02 -07:00
Gijs Kruitbosch
60fd73b747 Merge m-c to ux 2013-08-02 17:21:19 +02:00
Ms2ger
5c2b63d2c7 Merge m-c to inbound. 2013-08-02 11:07:57 +02:00
Marco Castelluccio
9c533e25da Bug 777402 - Implement support for packaged apps via the installPackage function in the mozapps DOM API in desktop web runtime. r=myk,wesj,fabrice 2013-08-01 17:00:39 -07:00
Ryan VanderMeulen
b30ebe7513 Backed out changesets 357e720b5a37 and f1971c2f5232 (bug 777402) for mochitest-other orange. 
CLOSED TREE
 2013-08-01 21:51:12 -04:00
Matthew Noorenberghe
63923e35da Merge mozilla-central to UX 2013-07-31 17:48:12 -07:00
Marco Castelluccio
dcac3cb880 Bug 777517 - Webapp installation alert should launch app on click. r=myk 2013-07-30 18:37:00 -07:00
Matthew Noorenberghe
657ab51a83 Merge mozilla-central to UX 2013-07-26 00:27:14 -07:00
Marco Castelluccio
cd515bb356 Bug 771294 - Install App doorhanger remains visible when installing page immediately loads another page. r=myk 
--HG--
rename : dom/tests/mochitest/webapps/bug_765063.xul => dom/tests/mochitest/webapps/install_and_redirect_helper.xul
 2013-08-05 16:30:41 -04:00
Mike de Boer
521729106f Bug 890690 - Support POST searches in about:home. r=gavin 
--HG--
extra : transplant_source : %A5%23%F7%EC%87%DC%ED%D3V%00%C1%D7K%90%D4%009Pp%24
 2013-07-25 02:43:19 +02:00
Shane Caraveo
1362d71920 bug 899671 avoid execution in socialapi during startup if not enabled, r=jaws 2013-08-12 12:06:22 -07:00
Gijs Kruitbosch
1d7de5b7fa Merging m-c to UX 2013-07-17 21:02:17 +02:00
Dão Gottwald
f3b8a31d05 Bug 894349 - Sort permissions in the site identity panel and the page info window alphabetically. r=jaws 2013-07-16 22:12:48 +02:00
Mike Conley
de1cc8b10b Automated merge with https://hg.mozilla.org/mozilla-central 2013-07-16 16:58:37 -04:00
Marco Castelluccio
b36df368eb Bug 777402 - Implement support for packaged apps via the installPackage function in the mozapps DOM API in desktop web runtime. r=myk,wesj,fabrice 2013-08-01 17:00:39 -07:00
Gijs Kruitbosch
40f46f3d07 Merge m-c to ux 2013-07-16 14:19:40 +02:00