Terrence Cole
49c1d4c9aa
Bug 773734 - Split off GC event observer notification from console logging; r=billm
2012-07-13 12:13:52 -07:00
Nicolas Silva
aac179cd09
Bug 598868: Add support for pushing video frames directly to the compositor thread, bypassing the content thread. r=cjones
2012-07-13 15:38:09 -04:00
Gregor Wagner
29007fc7cc
Bug 765435 - Make JS heap growth factor depend on the heap size after a GC and GC frequency. r=billm
2012-07-11 11:09:53 -07:00
Gavin Sharp
3e09c9914c
Bug 771980: provider must be re-usable, r=jaws
...
--HG--
extra : transplant_source : s%94%84%C2%7C%27%A3%B0%DB%5B%7F%40%96%A4S%21%FFcSA
2012-07-11 10:43:56 -07:00
Timothy B. Terriberry
45e55843f4
Bug 772341 - Enable Opus support by default, r=roc
2012-07-10 10:51:18 -07:00
Patrick McManus
cfcdc84aac
bug 770264 - http connection diagnostics r=honzab
2012-07-09 18:07:57 -04:00
Gene Lian
cf25796b14
Bug 749551 - Alarm API (Idl and dummy Dom). r=mounir sr=jonas
2012-06-22 15:37:49 +08:00
Raphael Catolino
0081a6c0a7
Bug 764481 - Add a pref to enable/disable experimental form features. r=mounir
...
--HG--
extra : rebase_source : 43b03c409b9cc52a991ca753c1848d453afbbb33
2012-06-23 14:32:54 +02:00
Ehsan Akhgari
15926d8730
Backout changeset 2c411daf6633 (bug 539356) because of performance and correctness regressions
2012-07-03 20:27:47 -04:00
Benjamin Smedberg
3f10b3b71c
Bug 769048 part F - Add the final bits to PluginModuleParent which watch for new Flash processes and inject a crashreporter into them, r=jimm
...
--HG--
extra : rebase_source : dd00ee4c29ec0b2f7bee0e48eedd426644b1ae43
2012-07-03 07:49:23 -04:00
Matthew Noorenberghe
3209e0c7e1
Bug 762993 - Implement a sandbox iframe for Identity IdP provisioning. r=jst,benadida,dolske
...
Based on Anant's code from bug 745345.
2012-06-28 01:57:00 -07:00
Matt Woodrow
4e1295308d
Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc
2012-06-30 15:06:10 +12:00
Bonnie Surender
6dcaba353f
Fixing bug 715041. Add support for Idle API. r=bent, jst
2012-06-29 01:32:21 -07:00
Jason Duell
f3ec1fa6b2
Bug 711793 - Delay websocket reconnection after abnormal termination. r=mcmanus
2012-06-28 17:53:50 -07:00
Jonathan Kew
8dc2e16f5b
bug 766505 - update the default Mac font prefs to include Indic fonts now shipped with the OS. r=jdaggett
2012-06-25 08:18:45 +01:00
Margaret Leibovic
508afabe75
Bug 767073 - Disable clipboard.autocopy on Android. r=mbrubeck
2012-06-21 12:08:07 -07:00
Panos Astithas
206ad00f97
Merge m-c to fx-team
2012-06-21 10:11:14 +03:00
Hub Figuière
cd89dee94c
Bug 761589 - Refactor accessibility.force_disabled to work on Mac too and make it tri-state. r=tbsaunde
2012-06-19 16:19:13 -07:00
Panos Astithas
80680028cb
Use a preference setting to decide whether to bind to the loopback interface only, or all interfaces (Bug 764679); r=dcamp,mfinkle,jgriffin,vingtetun
2012-06-20 16:31:50 +03:00
Ehsan Akhgari
5a8d9eb7b6
Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (libpref parts); r=bsmedberg
2012-06-05 22:10:17 -04:00
Ed Morley
7d13aab294
Backout 61fd66629c4f, 7c8121f8d3af & 2a2e9cf8fd41 (bug 539356), e31a5e6545d3 (bug 761884), 85fa80bd9792, a284ccb25b83, 2865904db9fc, 34e07b09c426, e9b3d41e0360, cef00ebcd6c8, f943b729ac14 & 783f298401b6 (bug 539356), 330a086f1570 (bug 741682), d80219c8842c (bug 739671), e8c96b4fd4da, 313af486e68d, 0adc41ff56dc, 0cd288a38085, f1d43208825c, 4859876972f3, eec8ef3ebe48, f7f29fcd1845, 6079b229d306, f23c3a7e7ce0, 9824458a41e2 & 6748b5496059 (bug 539356) for mochitest-4 orange & talos regressions on multiple platforms
2012-06-11 10:08:32 +01:00
Matt Woodrow
0e8bdfe6c2
Bug 539356 - Part 6 - Add compositing paint flashing to BasicLayers. r=roc
2012-06-11 16:44:08 +12:00
Tim Taubert
b435cf4f39
merge m-c to fx-team
2012-06-09 17:34:20 +02:00
Panos Astithas
8d4b76944a
Bug 761153 - Use the same preferences for enabling and configuring the remote debugging server across products (Part 1: desktop); r=dtownsend
2012-06-08 10:00:41 +03:00
Jason Orendorff
31a1022fa0
Bug 753542 - Add prefs to enable/disable E4X (javascript.options.xml.content and .chrome). r=bsmedberg, sr=jst.
2012-06-06 21:52:14 -05:00
Patrick McManus
f380d282a5
bug 761775 pref on spdy v3 r=josh
2012-06-06 16:37:15 -04:00
Geoff Lankow
1214b72681
Bug 749930 - Replace uses of nsILocalFile with nsIFile (compiled code only); r=bsmedberg
2012-06-06 14:08:30 +12:00
Andrew Quartey
ea5a6de0a9
Bug 731836 - Add preference to use Mesa LLVMpipe for software rendering - r=bjacob
2012-06-02 12:05:45 -04:00
Benoit Girard
e23c387ba6
Bug 760439 - Disable the OMTC pref from the default listing because it causes a startup crash loop. r=ajuma
...
OMTC on desktop is still in development and is not yet supported. However since it's half implemented and leads to a nasty state I'm remove the pref to make it harder to get into this bad state.
2012-06-01 11:34:51 -04:00
Jonathan Kew
22c3898303
bug 758241 - enable harfbuzz text shaping for all scripts on Android. r=jdaggett
2012-06-01 08:19:29 +01:00
Bill McCloskey
ef892730c4
Bug 735099 - Re-enable incremental GC (r=dmandelin)
2012-05-31 08:17:13 -07:00
Patrick McManus
c02e9fa5c8
bug 737470 patch 2 clone spdy/2 into spdy/3 r=honzab
...
--HG--
rename : netwerk/protocol/http/SpdySession2.cpp => netwerk/protocol/http/SpdySession3.cpp
rename : netwerk/protocol/http/SpdySession2.h => netwerk/protocol/http/SpdySession3.h
rename : netwerk/protocol/http/SpdyStream2.cpp => netwerk/protocol/http/SpdyStream3.cpp
rename : netwerk/protocol/http/SpdyStream2.h => netwerk/protocol/http/SpdyStream3.h
2012-05-25 17:37:08 -04:00
Benoit Jacob
b457d41c24
Bug 743753 - 2/4 - remove the webgl.verbose preference (always be verbose) - r=vlad
2012-05-23 12:07:19 -04:00
Doug Turner
f4e1e809f4
Bug 717103 - Implement Device Storage. r=sicking
2012-05-21 09:18:30 -07:00
Nicolas Silva
3dbfab5718
Bug 722012 - Added a call to XInitThreads before the first call to XOpenDisplay to fix OMTC crashes. r=karlt
...
--HG--
rename : toolkit/mozapps/update/test/chrome/test_0093_stagedBackground.xul => toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul
rename : toolkit/mozapps/update/test/unit/test_0113_general.js => toolkit/mozapps/update/test/unit/test_0110_general.js
rename : toolkit/mozapps/update/test/unit/test_0114_general.js => toolkit/mozapps/update/test/unit/test_0111_general.js
rename : toolkit/mozapps/update/test/unit/test_0115_general.js => toolkit/mozapps/update/test/unit/test_0112_general.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js
extra : rebase_source : f527614c4a5f0b8979bd8bc39dcd3ca739ba9e08
2012-05-22 11:34:34 -04:00
Bas Schouten
b490991f97
Bug 715768: Enable Azure-Thebes wrapper by default for D2D. r=jrmuizel
2012-05-21 17:27:36 +02:00
Ed Morley
7bdae23f76
Backout 027ed1748c81 (bug 740485) for M3 orange
2012-05-21 19:36:43 +01:00
Ed Morley
c6b0785957
Backout a693c64dc64e (bug 715768), c520957cc03f & 713ed280a80d (bug 756767), 20cb25a8b8ba (bug 756454), f3b5ad2320cb (bug 756424) for crashes
2012-05-21 18:56:46 +01:00
Doug Turner
23116ffc7c
Bug 740485 - Implement Device Storage. r=sicking
2012-05-21 09:18:30 -07:00
Bas Schouten
13166edd7d
Bug 715768: Enable Azure-Thebes wrapper by default for D2D. r=jrmuizel
2012-05-21 17:27:36 +02:00
Gervase Markham
87620f5676
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
Benjamin Smedberg
2187798a40
Bug 734847 part 2 - treewide changes resulting from the default-infallibility of hashtables; either remove useless result checks, or use the fallible version of APIs, depending on context, r=jlebar
...
--HG--
extra : rebase_source : 844b008c5167e6ca39a7ba9eeec8b30672938704
2012-05-18 13:30:49 -04:00
Bill McCloskey
730f9cf887
Backout incremental GC (bug 735099) for tinderbox crashes (r=orange)
2012-05-13 17:20:52 -07:00
Bill McCloskey
1d0bec6a5c
Bug 735099 - Re-enable incremental GC (r=terrence)
2012-05-11 21:07:28 -07:00
Chris Pearce
9b6d83ea59
Bug 716107 part 6 - Add UI to approve DOM fullscreen entry. r=dao
2012-05-09 09:47:19 +12:00
Chris Pearce
43c670b220
Bug 716107 part 2 - Remove full-screen-api.key-input-restricted keys pref. r=smaug
2012-05-09 09:47:18 +12:00
Jeff Muizelaar
3e12f6ef5f
Bug 750598. Add some heuristics to catch cases when we can use nearest filtering. r=roc
...
These may need some tuning to get right, but should be an improvement over
just disabling bilinear for backgrounds.
It also expectedly regresses tcheckerboard & tcheck2 because we're now
using bilinear when we were using nearest before.
2012-05-01 16:35:04 -04:00
Ed Morley
6d67d242a7
Backout 4c6759dcecd3 (bug 750598) for Android reftest-1 failures in background-size-zoom-repeat.html
2012-05-04 09:57:59 +01:00
Jeff Muizelaar
f16c9dd97a
Bug 750598. Add some heuristics to catch cases when we can use nearest filtering. r=roc
...
These may need some tuning to get right, but should be an improvement over
just disabling bilinear for backgrounds.
It also expectedly regresses tcheckerboard & tcheck2 because we're now
using bilinear when we were using nearest before.
--HG--
extra : rebase_source : 4e3396179193d6d7ca1dbe26b7dad090860abe0d
2012-05-01 16:35:04 -04:00
Ralph Giles
daed6b4964
Bug 674225 - Add Opus support to nsOggReader. r=cpearce
...
Parse and decode Opus streams embedded in the Ogg
container. Based on the draft specification from
https://wiki.xiph.org/OggOpus
Support is conditional on the runtime preference
setting media.opus.enabled, which is false by
default until we're confident the spec is stable
and useful.
This patch doesn't support the gain header or
multichannel files.
The LEUint*() functions from the skeleton parser
are used to read the multi-byte header fields.
This requires moving them to earlier in the file.
Mappings for the .opus filename extension are also
added to facilitate testing with local files.
2012-05-01 17:29:34 -07:00
Nicolas Silva
6436721408
Bug 743830 - Added 'gfx.xrender.enabled' pref (true by default). The pref is fetched in gfPlatformGtk.cpp and can be accessed through gfxPlatformGtk::UseXRender(). UseXRender is used in GLContextProviderGLX to set mUseTextureFromPixmap. r=jmuizelaar
...
--HG--
extra : rebase_source : 805947a2164aeb2dc71cc33086ac0bd201df3583
2012-04-18 10:27:32 -04:00
Ehsan Akhgari
c7d143b9fa
Merge mozilla-central into mozilla-inbound
2012-04-24 21:29:44 -04:00
Patrick Wong
15df25098f
Bug 745659 - Removed the nsPrintfCString constructor which takes a length and all corresponding instances that call that particular constructor. This is accomplished by removing the length component from the instantiation. r=jlebar
2012-04-24 14:43:00 -04:00
Ehsan Akhgari
5cac768d9b
Merge mozilla-central into birch
2012-04-24 10:49:42 -04:00
George Wright
ce694a1b63
Bug 747274 - Add a pref (default to true on Android) to forcible use nearest pixel filtering for background drawing. r=jrmuizel,ajuma a=blassey
2012-04-24 10:28:46 -04:00
Ehsan Akhgari
bbd5739974
Backout 190fc7cd65c6 (bug 747274) for breaking Android R1; a=bustage
2012-04-23 19:06:10 -04:00
Ehsan Akhgari
731cf9d3bd
Merge mozilla-central into birch
2012-04-19 10:03:36 -04:00
Myk Melez
3298891e22
bug 746156 - isolate webapp runtime files into subdirectory of Firefox package; r=bsmedberg, a=akeybl
2012-04-19 00:39:52 -07:00
George Wright
2f29a81ded
Bug 747274 - Add a pref (default to true on Android) to forcibly use nearest pixel filtering for background drawing. r=jrmuizel,ajuma a=blassey
2012-04-23 11:50:29 -04:00
Boris Zbarsky
1d381b0df9
Bug 742168. Refer to experimental bindings, not Paris bindings, in the pref code, since it will only control a subset of the Paris bindings. r=peterv
2012-04-18 12:02:04 -04:00
Myk Melez
253337cae3
bug 725408 - implement WebappRT launcher/shell; r=bsmedberg
2012-04-17 07:11:53 -07:00
Alessandro Decina
1c7e653fdb
Bug 422540 - GStreamer backend for audio/video decoding. r=cdouble, a=npotb
2012-04-18 18:33:13 -04:00
L. David Baron
e0255c8170
Add a preference for the threshold at which we have enough text within a BFC to use font size inflation. (Bug 706193, patch 1) r=roc
...
The basic principle behind this preference is that we don't want to use
font size inflation when all the text that we would have inflated would
fit within a line or two. We're better off preserving the layout than
inflating a small amount of text. However, we don't want the inflation
decision to vary between adjacent paragraphs, so this decision needs to
be made once for each block formatting context.
Once the later patches for this bug cause this preference to be honored,
this will be a change in behavior. The old behavior can be obtained by
setting the preference to 0.
2012-04-16 15:32:11 -07:00
Marco Bonardo
6cc1d6d44a
Backout e20a19a790dd (bug 743830) for linux QT bustage.
2012-04-13 21:43:13 +02:00
Nicolas Silva
cd1d382e7d
Bug 743830: Added 'gfx.xrender.enableded' pref (true by default). The pref is fetched in gfPlatformGtk.cpp and can be accessed through gfxPlatformGtk::UseXRender(). UseXRender is used in GLContextProviderGLX to set mUseTextureFromPixmap. r=jrmuizel,gw280
2012-04-11 14:04:54 -04:00
David Humphrey (:humph)
5f9892f336
Bug 633602 - Implement Pointer Lock (Mouse Lock) API. r=roc,smaug
2012-04-11 17:55:21 -04:00
Patrick McManus
3207aa242d
bug 743747: fix landing with 603514 r=honzab
2012-04-11 13:49:32 -04:00
Joe Drew
66874e0e3e
Bug 743749 - Instead of checkerboard, display background colour. r=blassey
2012-04-11 12:25:40 -04:00
Benoit Jacob
dc36f05c94
Bug 686735 - 1/2 - Implement no-gfx-driver-workarounds mode - r=joe,ajuma,jgilbert
...
Part 1: introduce the gfx.work-around-driver-bugs preference and handle most existing workarounds
2012-04-10 11:49:10 -04:00
Masayuki Nakano
a7e1afe2d5
Bug 668157 part.1 Add Preferences::GetType() and Preferences::GetDefaultType() r=roc
2012-04-04 13:06:27 +09:00
Masatoshi Kimura
442d5700c3
Bug 738043 - Don't ignore user set values from pref files even if values are identical to default. r=roc
2012-04-03 20:08:28 -04:00
Aryeh Gregor
ca85f01f9d
Bug 738366 - Default styleWithCSS to false; r=ehsan
2012-04-03 17:16:05 +03:00
Justin Lebar
3494c5ed8e
Bug 738011 - Separate "detached" from "ghost" windows in about:memory. r=njn,mccr8
...
--HG--
extra : rebase_source : 02d563277907231953728a0a99847c466665dbb0
2012-04-02 22:28:04 -04:00
Patrick McManus
ba0bc6694b
bug 739617 - cannot upload large files r=honzab
...
--HG--
extra : rebase_source : 5ea85a021233cf79a539980efc859a2d5372fe53
2012-04-02 20:36:11 -04:00
Matt Brubeck
678b0cfe89
Back out bug 738011, bug 738624, and bug 737857 because of WinXP debug reftest log errors
...
--HG--
extra : rebase_source : 965c755f6416e2ca102b38633fe7a2c7267e956e
2012-04-02 12:44:31 -07:00
Justin Lebar
f5815cc539
Bug 738011 - Separate "detached" from "ghost" windows in about:memory. r=njn,mccr8
...
--HG--
extra : rebase_source : 5194c9062cdfcd215ce5d708b1b472cf5ba7f480
2012-04-02 10:37:04 -04:00
Ed Morley
e0cc7fbc48
Backout 9e4d09efa335 (bug 737857), bd73daadcfe9 (bug 738624), 110338618465 (bug 738011) for mochitest-oth orange
2012-04-01 03:58:06 +01:00
Justin Lebar
918da37a8b
Bug 738011 - Separate "detached" from "ghost" windows in about:memory. r=njn,mccr8
...
--HG--
rename : parser/htmlparser/tests/mochitest/file_bug672453_bomless_utf16.html => extensions/universalchardet/tests/bug631751be_text.html
rename : dom/bindings/test/test_lookupGetter.html => js/xpconnect/tests/mochitest/test_bug462428.html
rename : b2g/components/UpdatePrompt.js => mobile/android/components/UpdatePrompt.js
rename : toolkit/mozapps/update/updater/progressui_gonk.cpp => toolkit/mozapps/update/updater/progressui_null.cpp
extra : rebase_source : 11dacf98b525eec3912f209e612a03b0c4ca0a96
2012-03-31 15:39:31 -07:00
Peter Van der Beken
09128a75d3
Fix for bug 740069 (Generate JS bindings in C++ with a python script for DOM objects on the main thread and in workers. Infrastructure and new bindings for XMLHttpRequest). Patch by bent/bz/bholley/jst/khuey/peterv, r=bent/bz/bholley/jlebar/khuey/peterv/sicking/smaug.
...
--HG--
rename : js/xpconnect/tests/mochitest/test_bug462428.html => dom/bindings/test/test_lookupGetter.html
2012-03-30 21:42:20 -07:00
Phil Ringnalda
b4da60b42d
Back out 0cb85ff0f764 (bug 738568), 9949bb092303 (bug 730209), 095fd525afa7 (bug 729924), dcf8929a8115 (bug 633602) because of widely scattered and unclear bustage on a CLOSED TREE
2012-03-28 22:37:46 -07:00
David Humphrey
03dc4eeeee
Bug 633602 - Implement Pointer Lock (Mouse Lock) API. r=roc, smaug
2012-03-28 21:00:14 -04:00
Phil Ringnalda
8d8cf286e2
Merge m-c to m-i
2012-03-27 21:21:11 -07:00
Tim Taubert
04ee0113a8
merge m-c to fx-team
2012-03-28 00:33:42 +02:00
Robert Strong
ec6279523d
Bug 491947 - Disable DDE shell integration. r=jmathies
2012-03-26 12:45:29 -07:00
Avi Halachmi (:avih)
11eac7e423
Bug 737758: part 3: Cleanups and semantic consistency [r=roc]
2012-03-26 11:53:45 +02:00
Avi Halachmi (:avih)
d705a99716
Bug 737758: part 1: Propagate mouse wheel event origin from ESM [r=roc]
2012-03-26 11:50:30 +02:00
Gregor Wagner
746c6fda8d
Bug 678695 - Settings API. r=sicking, fabrice, smaug
2012-03-26 14:49:38 -07:00
Josh Aas
d1d8f07334
Bug 738542: Increase min required JRE to 1.6. r=smichaud
2012-03-23 11:25:16 -04:00
Marco Bonardo
d525c9e71e
Merge last green PGO from inbound to central
2012-03-23 12:49:57 +01:00
Patrick McManus
cca184acac
bug 603514 - http stalled read detection r=honzab
...
When a connection that involves a pipelined transaction has been stalled (i.e.
idle with an open transaction, not an idle persistent connection) for a
second move any transactions that are pipelined after the current one onto
different connections (and implicitly close this connection when done with the
current transaction).
when it has been stalled for 10 seconds (pref configurable), cancel the current
transaction itself too - depending on its state it can hopefully be restarted
on a clean connection.
2012-03-22 19:39:31 -04:00
Patrick McManus
f5c0c33db7
bug 603512 - large objects block pipelines r=honzab
...
the type and state patch tries hard not to form pipelines behind resources that
could become head of line blockers. But of course that requires the ability to
predict the future, and won't be perfect.
This patch reacts to a transaction that has a large response body (defined by
either a large content-length header or actually reading a large number of
chunked bytes) by cancelling any transactions that have been pipelined down the
same connection and rescheduling them elsewhere. It also changes the type of
the connection to "solo", which prevents new transactions from being pipelined
onto this one and provides class-specific negative feedback to the pipeline
manager so that near-future requests to the same host of the same type (e.g.
general) will not be pipelined but other types (e.g. img or js/css) can still
do that.
Content-Length is ideal, because it allows us to identify the problem so early.
But even actually reading the document for a fairly long time gives it a fairly
high probability of not ending soon. (i.e. long document sizes are spread over
a larger range than small ones. duh.)
The pref network.http.pipelining.maxsize controls the threshold. I set the
default at 300KB, which is roughly the bandwidth delay product of a 2mbit 120ms
rtt connection and 1 rtt is mostly what you are giving up by canceling it on
one connection and sending it on another. (modulo maybe needing a handshake).
2012-03-22 19:39:31 -04:00
Patrick McManus
15a48d8534
bug 599164 pipeline with type and state r=honzab
2012-03-22 19:39:31 -04:00
Patrick McManus
bba26f5a30
bug 597684 Implement HTTP Assoc-req and Banned Pipelines on nsHttpConnectionInfo r=honzab
2012-03-22 19:39:31 -04:00
Avi Halachmi
e9dff0c2af
Bug 736251 - Change scrolling duration to 400ms to make it feel more responsive. r=roc, ui-r=limi
2012-03-21 20:02:50 -04:00
Pranav Ravichandran
75b8ad96ec
Bug 535594 - Fix/Clean-up 'security.enable_java' preference references. r=bsmedberg
2012-03-21 19:52:23 -04:00
Serge Gautherie
31c39e1250
Bug 735573. (Av1) Document UseDefaultPrefFile() and fix its nsresult value. r=bsmedberg.
2012-03-23 02:13:20 +01:00
Vladan Djeric
effa6590c8
Bug 722368 - Report slow SQL created from dynamic strings to Telemetry. r=taras
2012-03-21 13:26:48 -04:00
Jonathan Kew
379465b27f
bug 721719 - add more ICS fonts to the default Android prefs. r=jdaggett
2012-03-17 09:39:09 +00:00
Gervase Markham
afd7b40d0b
Bug 747871 - add .fr, .re, .pm, .tf, .yt and .wf to IDN TLD whitelist.
2012-04-24 17:16:08 +01:00
Marco Bonardo
312ed3ed80
Merge inbound and central
2012-03-16 13:42:16 +01:00