Tim Taubert
7c1a224b2f
Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander
2014-01-21 14:13:45 +01:00
Tim Taubert
8fafa9176a
Bug 952092 - Get rid of post data in SessionStore r=smacleod
...
From 243232f7d2522e82622c031923271ed76ffdc42a Mon Sep 17 00:00:00 2001
2014-01-14 18:21:48 +01:00
Ryan VanderMeulen
b05202b7e2
Merge inbound to m-c.
2014-01-16 15:06:12 -05:00
Anton Kovalyov
d9b64b76ed
Bug 734439 - Add code folding support to the source editor. r=msucan r=benvie
2014-01-15 16:23:32 -08:00
Anton Kovalyov
57570f0640
Bug 941725 - Add emacs and vim key bindings to source editor. r=harth r=benvie r=msucan
2014-01-15 12:04:19 -08:00
Ed Morley
746b0390b4
Merge latest green fx-team changeset and mozilla-central
2014-01-15 16:14:41 +00:00
Chris Karlof
3849442104
Bug 959859: Update remote Firefox Accounts content URL to use new deployment. r=markh
2014-01-15 09:53:41 +01:00
Ben DeCoste
2dae43534f
Bug 910183 - Highlight trailing space in the editor. r=msucan
2014-01-14 14:12:39 -08:00
Gian-Carlo Pascutto
24ad1b7f19
Bug 783047 - Update SafeBrowsing URLs to use HTTPS. r=mmc,dcamp sr=gavin
2014-01-16 09:27:59 +01:00
Monica Chew
b85fdf7bc2
Bug 957704: Switch from apikey to key for browser.safebrowsing.updateURL (r=gcp,dougt)
2014-01-09 10:20:59 -08:00
Hubert B Manilla
98892aa0be
Bug 913665 - Detect minified files and pretty print them by default; r=fitzgen
2013-12-24 15:32:55 +01:00
Tim Taubert
4be4a6b411
merge m-c to elm
2013-12-19 15:52:32 +01:00
Nick Fitzgerald
00a923905f
Bug 929349 - Integrate a tracing debugger into our existing debugger; r=vporof,past
2013-12-18 14:17:27 -08:00
Brian Warner
84b3f1b25e
Bug 949699 - switch fxa jelly to "moar_native".
2013-12-17 15:45:03 +11:00
Nick Alexander
4eb068477b
Merge m-c to elm
2013-12-11 14:08:02 -08:00
Nick Alexander
17885804f2
Merge m-c to elm
2013-12-11 10:25:40 -08:00
Heather Arthur
1ef2e1c103
Bug 926014 - Support CSS source maps; r=dcamp
...
--HG--
rename : browser/devtools/styleeditor/StyleEditorPanel.jsm => browser/devtools/styleeditor/styleeditor-panel.js
2013-12-06 23:52:32 -08:00
Carsten "Tomcat" Book
6cbfff1e23
Backed out changeset 8deb6f225d0a (bug 926014) XPC Shell failures and other failures
...
--HG--
rename : browser/devtools/styleeditor/styleeditor-panel.js => browser/devtools/styleeditor/StyleEditorPanel.jsm
2013-12-07 09:50:02 +01:00
Heather Arthur
f025be6927
Bug 926014 - Support CSS source maps; r=dcamp
...
--HG--
rename : browser/devtools/styleeditor/StyleEditorPanel.jsm => browser/devtools/styleeditor/styleeditor-panel.js
2013-12-06 23:52:32 -08:00
Brian Grinstead
2c3d0eab59
Bug 938616 - webconsole UI updates while in split mode with other panels;r=msucan
2013-12-06 09:46:51 -06:00
Stephen Pohl
a481a4c486
Backout 2ea21428f70c (bug 860493) while working on overall performance and bugs for swipe animations. r=me
2013-12-06 09:41:09 -05:00
J. Ryan Stinnett
01d7ec0423
Bug 925921 - Enable Manifest Editor by default. r=paul
2013-12-04 13:29:47 -06:00
Nick Alexander
93e112c0d8
Merge m-c to elm
2013-11-18 08:22:59 -08:00
Gijs Kruitbosch
1e3930ad3d
Merge m-c to ux
2013-11-17 23:37:53 +01:00
Florian Quèze
86092d2582
Bug 930641 - Remove the social.allowMultipleWorkers preference, r=mixedpuppy.
2013-12-18 16:50:05 +01:00
Gijs Kruitbosch
4f5a01fecc
Merge mozilla-central and ux
2013-11-15 18:32:01 +01:00
Nick Alexander
c4c4054b38
Merge m-c to elm
2013-11-14 22:41:14 -08:00
Nick Alexander
954a0cd13b
Merge b-i to elm
...
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander
4bf3628f8f
Merge m-c to elm
2013-11-13 13:43:32 -08:00
Paul Rouget
30ac55dbf8
Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau
2013-11-15 21:47:00 -05:00
Ed Morley
c3bf3239c0
Merge mozilla-central and fx-team
2013-11-12 15:12:05 +00:00
Oprea Andrei
55c481da05
Bug 722267 - Option to enable/disable timestamps for messages in the console; r=msucan
2013-11-11 19:00:07 +02:00
Zachary Carter
6598d03bb0
Bug 935232 - Implement a client for the Firefox Accounts auth server. r=markh
2013-12-02 13:56:24 -08:00
Nick Alexander
ced852a484
Merge m-c to elm
2013-11-04 21:25:12 -08:00
Wes Kocher
e6aeda0671
Merge inbound to m-c
2013-11-04 21:09:17 -08:00
Stephen Pohl
d54b503b6d
Bug 860493 - Enable history swipe animations by default on nightly and aurora (implemented in bug 678392). r=smichaud
2013-11-04 13:26:41 -05:00
Ryan VanderMeulen
dc98bd3508
Backed out changesets f488602d26c9 and 09725c69fd76 (bug 860493) for OSX bustage.
...
CLOSED TREE
2013-11-04 12:55:56 -05:00
Stephen Pohl
81651a44ae
Bug 860493 - Enable history swipe animations by default on nightly and aurora (implemented in bug 678392). r=smichaud
2013-11-04 12:10:10 -05: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
Nick Alexander
b2ece0addd
Merge m-c to elm
2013-10-29 13:13:49 -07:00
Gijs Kruitbosch
c267cbe07d
Merge mozilla-central and ux
2013-11-12 17:30:17 +01:00
Gijs Kruitbosch
16224718cf
Merge mozilla-central and ux
2013-11-12 09:27:50 +01:00
Jared Wein
012d1115e2
Automated merge with https://hg.mozilla.org/mozilla-central
2013-11-08 13:22:23 -05:00
Gijs Kruitbosch
37ba637e69
Merge m-c to ux
2013-11-06 14:36:26 +01:00
Carsten "Tomcat" Book
5abe12cadb
merge fx-team to mozilla-central
2013-11-06 13:09:28 +01:00
Gijs Kruitbosch
c38e551bb3
Merge mozilla-central and ux
2013-11-06 09:01:08 +01:00
Mike Hommey
5bc79f4c3d
Bug 934905 - Remove browser/app/profile/extensions/Makefile.in after bug 867445. r=mshal
2013-11-06 14:25:14 +09:00
Matthew Noorenberghe
e8d8f80693
Merge mozilla-central to UX
2013-11-05 01:04:20 -08:00
Gijs Kruitbosch
2312eb362b
Merge mozilla-central and ux
2013-11-02 11:33:53 +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
Nick Alexander
abaf8ce510
Merge m-c to elm
2013-10-26 17:23:11 -07:00
Ed Morley
d160d00dbe
Merge mozilla-central and fx-team
2013-10-25 12:19:55 +01:00
Carsten "Tomcat" Book
f19f416288
Merge Fx-Team to Mozilla-Central
2013-10-25 11:21:15 +02:00
Stephen Pohl
e3a9eca39f
Bug 930768: Backout 6155ea7e8dea for causing pages to refresh (instead of using bfcache) when swiping back and forth on OSX. r=smichaud
2013-10-24 21:57:54 -04:00
Monica Chew
14a07a2065
Bug 887044: Remove CsdTesting/Mozilla from User-Agent, set safebrowsing URLs to use the GOOGLE_API_KEY (r=dougt)
2013-11-01 15:43:28 -07:00
Nick Alexander
e4a9d8d0e4
Merge m-c to elm
2013-10-24 09:35:02 -07:00
Monica Chew
7c72bdd32b
Bug 895476: Enable updating local lists for application reputation (r=gcp)
2013-10-31 14:15:14 -07:00
Paul Rouget
f2fbd2c126
Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau
2013-11-07 09:14:22 -05:00
Ryan VanderMeulen
a721e543d2
Backed out changesets e41b160a4ada and 90624f34525a (bug 912891) on the suspicion of turning bug 934852 into a perma-fail on WinXP debug.
2013-11-07 14:08:14 -05:00
Paul Rouget
da984a4792
Bug 912891 - [app manager] Open the toolbox in the app manager. r=ochameau
2013-11-07 09:14:22 -05:00
Paolo Amadini
30c71292f2
Bug 928349 - Add a build-time setting to use only the JavaScript API for downloads, and enable it in Firefox for Desktop. r=enn
2013-10-23 21:46:47 +02:00
Benjamin Smedberg
6d4198e5fd
Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy, r=gfritzsche
2013-11-20 15:33:05 -05:00
Anton Kovalyov
e26d1575d0
Bug 929766 - Remove Orion from the SourceEditor component. r=msucan
2013-11-19 15:53:13 -08:00
Nick Alexander
e4013cce32
Merge m-c to elm
2013-10-23 09:00:38 -07:00
Victor Porof
39ed225e41
Bug 910955 - Implement a live WebGL shader editor, r=dcamp
2013-10-25 10:18:41 +03:00
Ed Morley
2ef751e1f6
Backed out changeset cfd30965638a (bug 906839)
2013-10-24 18:50:31 +01:00
Shane Caraveo
ddef2f007b
Bug 906839 - enable by default social.allowMultipleWorkers - flip the pref, r=markh.
2013-10-24 15:53:37 +02:00
Nick Alexander
9647199b35
Merge m-c to elm
2013-10-22 09:19:06 -07:00
Rob Campbell
2298755141
Bug 909756 - Turn off CSS warnings by default in Web Console. r=msucan
2013-10-22 03:25:54 +02:00
Nick Alexander
1870fe9166
Merge m-c to elm
2013-10-21 09:19:47 -07:00
Benjamin Smedberg
1b8c0cf234
Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one
...
--HG--
extra : rebase_source : 90f2f8dc85b9198bca608b46bee037d93a118543
2013-10-21 10:33:49 -04:00
Yury Delendik
2fd5d5a66a
Bug 926988 - Keep Shumway in nightly only
2013-10-21 20:39:43 -05:00
Paul Rouget
deef4c74bc
Bug 926371 - show reflow events in the webconsole. r=msucan
2013-10-22 08:43:00 +01:00
Nick Alexander
bcdd987f34
Merge fx-team to elm
2013-10-18 11:39:01 -07:00
Robert Strong
34f338fec8
bug 928489 - Bug 928489 - Disable update xml certificate checks on Windows. r=bbondy
2013-10-19 22:36:40 -07:00
Carsten "Tomcat" Book
40ca48c269
merge fx-team to mozilla-central
2013-10-18 11:40:53 +02:00
Stephen Pohl
2cd62c9469
Bug 860493 - Enable history swipe animations by default (implemented in bug 678392). r=smichaud
2013-10-22 20:49:36 -04:00
Tim Taubert
2366f49f07
merge m-c to elm
2013-10-17 10:51:26 -07:00
Tim Taubert
90c78483c7
merge m-c to elm
2013-10-16 10:25:32 -07:00
Benjamin Smedberg
d8c6d994de
Bug 927174 - Add a "More Info..." link to the plugin click-to-activate panel which links to SUMO, r=jaws
...
--HG--
extra : rebase_source : 06f59db92ea08e64f0d9e39bfeb20460ea780d36
2013-10-16 16:35:40 -04:00
Carsten "Tomcat" Book
a8c66d5366
Merge mozilla-central to fx-team
2013-10-17 13:56:42 +02:00
Nick Alexander
48da05ce81
Merge m-c to elm
2013-10-14 09:05:11 -07:00
Nick Alexander
d4659a555b
Merge m-c to elm.
2013-10-09 10:11:44 -07:00
Gavin Sharp
8086bb9e1f
Bug 922338: update link to phishing protection info in Firefox, r=dao,wesj,mbrubeck,fabrice
2013-10-08 14:00:48 -07:00
Nick Alexander
ef14d309a6
Merge m-c to elm
2013-10-02 10:46:44 -07:00
Nick Alexander
e4c66c711d
Merge m-c to elm
2013-10-01 08:55:35 -07:00
Yury Delendik
bd9ba1e96b
Bug 904346 - Integrate Shumway into Firefox. r=gps
2013-09-30 18:23:41 -05:00
Ben Hearsum
5898489f25
bug 885477: switch Nightly users to Balrog - default to aus3 unless we're in a NIGHTLY_BUILD. r=rstrong
...
--HG--
rename : accessible/src/windows/ia2/ia2Accessible.cpp => accessible/src/windows/msaa/AccessibleWrap.cpp
rename : accessible/src/windows/ia2/ia2Accessible.h => accessible/src/windows/msaa/AccessibleWrap.h
rename : js/xpconnect/src/XPCShellImpl.cpp => js/xpconnect/shell/xpcshell.cpp
extra : rebase_source : f6cb7be487206b6828b454ef5dac66810c5efe18
2013-09-30 16:42:21 -04:00
Nick Alexander
5e6f3bdf39
Merge m-c to elm
2013-09-30 08:09:11 -07:00
Ben Hearsum
58eb6ef81b
bug 885477: switch Nightly users to aus4.mozilla.org. r=rstrong
2013-09-30 09:50:03 -04:00
Zach Carter
20d5669512
Bug 913199 - Use HTTPS for FxAccounts server URL. r=rnewman
...
--HG--
extra : rebase_source : 61f4e1d3f071da8ec504b0a91e77926eac72f86d
2013-09-27 12:02:20 -07:00
Nick Alexander
6a72c57c75
Merge m-c to elm
2013-09-27 08:41:13 -07:00
Nick Fitzgerald
518a378ef8
Bug 925073 - Create a pref to enable/disable pretty printing in the UI; r=vporof
2013-10-11 13:52:50 -07:00
Nick Alexander
cbdc886101
Merge m-c to elm.
2013-09-23 08:47:42 -07:00
Tim Taubert
1135045ba3
merge m-c to elm
...
--HG--
rename : browser/base/content/test/Makefile.in => browser/base/content/test/general/Makefile.in
2013-09-20 08:55:13 +02:00
Nick Alexander
9f905ada96
Merge m-c to elm
2013-09-18 11:08:28 -04:00
Ryan VanderMeulen
59d81139f5
Backed out 5 changesets (bug 894595) for causing new mochitest-bc intermittent failures.
...
Backed out changeset 778adbf10481 (bug 894595)
Backed out changeset 5b621d8eb5e9 (bug 894595)
Backed out changeset 91303ff403ac (bug 894595)
Backed out changeset 3caa785122bf (bug 894595)
Backed out changeset 108e2b8e177c (bug 894595)
2013-09-17 13:35:58 -04:00
Tim Taubert
07d3b4394c
merge m-c to elm
2013-09-16 09:14:47 +02:00
Heather Arthur
e3e667d6d5
Bug 892268 - Zoom devtools with Ctrl/Cmd +/-/0; r=dcamp
2013-09-14 23:26:18 -07:00
Michael Ratcliffe
1ea20c3812
Bug 911748 - Add default color dropdown to devtools options panel. r=jwalker
2013-09-16 11:01:25 +01:00
Nick Alexander
97528cb458
Merge m-c to elm.
2013-09-13 11:59:08 -07:00
Paolo Amadini
e95feeeb26
Bug 899110 - Remove the code to switch between different back-ends from the Downloads Panel. r=enn
2013-11-04 19:21:13 +01: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
Tim Taubert
856ed924e5
merge m-c to elm
2013-09-12 10:35:40 +02:00
Monica Chew
c1b4886200
Bug 842828: Clean up urlclassifier.gethashtables preferences (r=gcp)
...
* * *
Bug 842828: Mark attributes of nsIApplicationReputationQuery as readonly, remove unused field (r=mossop)
* * *
Bug 842828: Check local list to suppress remote lookups (r=paolo)
2013-09-26 06:51:59 -07:00
Alexandre Poirot
1080d3f324
Bug 915226 - Merge all refresh/start/stop/debug buttons to two buttons called update and debug r=paul
2013-09-13 15:36:00 +02:00
Paul Rouget
ed776b7c84
Bug 912887 - [app manager] first run experience. r=ochameau
2013-09-14 04:49:00 +02:00
Robert Strong
bfac3895b6
Bug 921045 - include the new update cert and remove the no longer used Equifax cert. r=bbondy
2013-11-22 12:48:07 -08:00
Paul Rouget
1de2eec63a
Bug 913945 - [app manager] Turn it on. r=ochameau
2013-09-10 04:50:00 +02:00
Paul Rouget
7198758774
Bug 912892 - [app manager] simulator launch UI. r=ochameau
2013-09-10 11:42:00 +02:00
Nick Alexander
0d250f3479
Merge m-c to elm
2013-09-03 10:45:50 -07:00
Paul Rouget
d744ae07cf
Bug 777972 - [responsive mode] translate click events to touch events. r=mratcliffe
2013-09-03 09:15:51 +02:00
Tim Taubert
01e2e2bf33
Bug 894595 - part 3 - Use asynchronous data collection for delayed save state calls; r=yoric
2013-08-29 16:02:42 +02:00
Gijs Kruitbosch
a535143dd6
Bug 917706 - menu items and shortcuts should start working as soon as the relevant pref(s) are flipped, r=robcee
...
--HG--
extra : rebase_source : ecf03f556d09eb045bc395d36b7ae9b4ee9c66ac
2013-09-19 09:10:42 +02:00
Zach Carter
cb26f8af15
Bug 904612 - Implement first version of about:accounts wrapper for desktop; r=gavin,ttaubert
2013-08-27 13:31:03 -07:00
Tim Taubert
29223851d2
Backed out changeset 571b2854e11f
2013-08-28 09:56:59 +02:00
Zach Carter
2795d69019
imported patch lloyd-patch
2013-08-27 13:31:03 -07:00
Carsten "Tomcat" Book
54cb72cd2d
Backed out changeset a0737b57f233 (bug 912891) for browser chrome failures
2013-11-12 08:47:46 +01:00
J. Ryan Stinnett
f64763b102
Bug 922193 - Add VariablesView as manifest editor in App Manager. r=paul
2013-10-09 00:52:38 -05:00
Raymond Lee
d11cb525ca
Bug 908244 - When a download is launched automatically, the target file should be deleted when the browser is closed. r=paolo
2013-09-12 14:03:00 +02:00
Tetsuharu OHZEKI
622c18d7d8
Bug 915096 - Remove needless prefs for devtools.layoutview.*
. r=paul.rouget
2013-09-13 09:25:48 -04:00
Ed Morley
f0e58d0012
Merge latest green inbound changeset and mozilla-central
2013-09-20 10:18:21 +01:00
Tim Taubert
fe84e7bf67
Backed out changeset 2514aac648b2 (bug 506975)
2013-08-29 14:22:11 +02:00
Manish Goregaokar
e61fde1fbd
Bug 506975 - Write sessionstore.js less often when on battery; r=ttaubert
2013-08-29 09:09:51 +02:00
Paolo Amadini
353706cefc
Bug 847863 - Part 8 of 8 - Use the JavaScript API instead of nsIDownloadManager as the back-end for the panel. r=enn
2013-08-21 09:36:07 +02:00
Ed Morley
ac3e373efd
Backed out changeset c2b4444ad9fd (bug 847863)
2013-08-20 11:52:03 +01:00
Paolo Amadini
1e07c09cf0
Bug 847863 - Part 8 of 8 - Use the JavaScript API instead of nsIDownloadManager as the back-end for the panel. r=enn
2013-08-19 23:39:14 +02:00
Ekanan Ketunuti
bc3e065c73
Bug 896211 - Mixed content help link should be an app.support.baseURL-relative link rather than in its own pref. r=mconley
2013-08-19 08:49:11 -04:00
Ben Hearsum
c468e09561
bug 927364: make Balrog ride the trains to Aurora. r=gavin
2013-10-17 10:39:25 -04:00
Tim Taubert
67d4689225
Bug 894595 - part 3 - Use asynchronous data collection for delayed save state calls; r=yoric
2013-09-17 12:37:23 +02:00
Eddy Bruel
6a86294515
Bug 906963 - Add a "ignore caught exceptions" checkbox to the UI; r=dcamp
2013-09-09 19:02:41 +02:00
Paul Rouget
5875989bf7
Bug 912910 - [app manager] add a menuitem to the devtools menu. r=mossop
2013-09-05 07:37:00 +02: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
Georg Fritzsche
4b6324dca3
Bug 899080 - Let all plugins except Flash default to click-to-play. r=bsmedberg
2013-09-04 16:05:21 +02:00
Michael Ratcliffe
a74c0a7cd1
Bug 694019 - we should be able to highlight and inspect a :pseudo element r=mratcliffe
2013-09-04 17:43:40 +02:00
Wes Kocher
f95cc1a74a
Merge m-c to fxteam
2013-11-04 21:23:11 -08: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
Ben Hearsum
2fc339d09b
bug 803531: renew authenticode certificates in september 2013 - update in-tree fingerprints for add-on hotfixes. r=mossop
...
--HG--
rename : browser/base/content/test/general/moz.build => browser/base/content/test/newtab/moz.build
extra : rebase_source : bbb8df66e22b5541e3112b4898e2a4eab1462f90
2013-09-19 13:31:33 -04:00
Ryan VanderMeulen
e724d8a766
Backed out changesets af0dda676cb7, 550e2f5b4224, and bb76828c5f22 (bug 842828) for B2G bustage and xpcshell failures.
...
CLOSED TREE
2013-09-25 11:50:51 -04:00
Monica Chew
e974c59872
Bug 842828: Clean up urlclassifier.gethashtables preferences (r=gcp)
2013-09-25 07:03:45 -07:00
Gijs Kruitbosch
e9c0b9a2ba
Merge mozilla-central and ux
2013-10-29 17:23:48 +01:00
Matthew Noorenberghe
562ff5a575
Merge mozilla-central to UX
2013-10-25 18:30:46 -07:00
Gijs Kruitbosch
ca3e353986
Merge m-c to ux
2013-10-25 11:45:31 +02:00
Gijs Kruitbosch
b05750dcee
Merge mozilla-central and ux
2013-10-25 10:23:03 +02: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
Gijs Kruitbosch
de9ce9d493
Merge mozilla-central and ux
2013-10-22 10:34:17 +02:00
Gijs Kruitbosch
1d094f07a0
Merge mozilla-central and ux
2013-10-21 10:03:47 +02:00
Gijs Kruitbosch
a6148ebc99
Merge m-c to UX
2013-10-18 12:56:16 +02:00