Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -66,6 +66,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3562472 add support for Solaris and FreeBSD system load and memory display in server status
 - bug #3553068 [import] Table import from XML file fails
 - replace Highcharts with jqplot for Display chart 
+- bug #3567684 [edit] Pasting value doesn't clear null checkbox
 
 3.5.2.2 (2012-08-12)
 - [security] Fixed XSS vulnerabilities, see PMASA-2012-4

js/makegrid.js

@@ -768,6 +768,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $(g.cEdit).find('.edit_box').live('keypress change', function(e) {
                             $checkbox.prop('checked', false);
                         });
+                        // Capture ctrl+v (on IE and Chrome)
+                        $(g.cEdit).find('.edit_box').live('keydown', function(e) {
+                            if (e.ctrlKey && e.which == 86) {
+                                $checkbox.prop('checked', false);
+                            }
+                        });
                         $editArea.find('textarea').live('keydown', function(e) {
                             $checkbox.prop('checked', false);
                         });