commit 5a0472e8ea9128f75bca04f5f65682ae8280c208 (HEAD, refs/remotes/origin/master)
Author: Simen Heggestøyl <simenheg@gmail.com>
Date:   Tue Feb 16 21:52:59 2016 +0100

    Add column layout module to CSS property list
    
    * lisp/textmodes/css-mode.el (css-property-ids): Add properties from
    CSS Multi-column Layout Module.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index f72f0a4..4064374 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -149,6 +149,15 @@
     "box-decoration-break" "break-after" "break-before" "break-inside"
     "orphans" "widows"
 
+    ;; CSS Multi-column Layout Module
+    ;; (https://www.w3.org/TR/css3-multicol/#property-index)
+    ;; "break-after", "break-before", and "break-inside" are left out
+    ;; below, because they're already included in CSS Fragmentation
+    ;; Module Level 3.
+    "column-count" "column-fill" "column-gap" "column-rule"
+    "column-rule-color" "column-rule-style" "column-rule-width"
+    "column-span" "column-width" "columns"
+
     ;; CSS Overflow Module Level 3
     ;; (http://www.w3.org/TR/css-overflow-3/#property-index)
     "max-lines" "overflow" "overflow-x" "overflow-y"

commit c850fe6e0bcff5d33100b687ecf25a91f79f17b0
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Tue Feb 16 11:23:58 2016 +0100

    Minor cleanup in CONTRIBUTE and test/README
    
    * CONTRIBUTE: Remove detailed explanation about testing; this
    is now in test/README.
    
    * test/README: Don't mention automated/ subdirectory.

diff --git a/CONTRIBUTE b/CONTRIBUTE
index d17e53c..e39c665 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -275,28 +275,9 @@ If your test lasts longer than some few seconds, mark it in its
 'ert-deftest' definition with ":tags '(:expensive-test)".
 
 To run tests on the entire Emacs tree, run "make check" from the
-top-level directory.  Most tests are in the directory
-"test/".  From the "test/" directory, run "make
-<filename>" to run the tests for <filename>.el(c).  See
-"test/Makefile" for more information.
-
-Tests which are tagged ":expensive-test" are enabled additionally, if
-you run "make check-expensive" from the top-level directory.  "make
-<filename>" as mentioned above incorporates expensive tests for
-<filename>.el(c). You can also define any ert selector on the command
-line. So "make check SELECTOR=nil" is equivalent to "make
-check-expensive".
-
-You could also use predefined selectors of the Makefile. "make
-<filename> SELECTOR='$(SELECTOR_DEFAULT)'" runs all tests for
-<filename>.el(c) except the tests tagged as expensive.
-
-Selectors can be defined with different methods, see (info "(ert)Test
-Selectors") or
-https://www.gnu.org/software/emacs/manual/html_node/ert/Test-Selectors.html
-If your test file contains the tests "test-foo", "test2-foo" and
-"test-foo-remote", and you want to run only the former two tests, you
-could use a regexp: "make <filename> SELECTOR='\"foo$$\"'" .
+top-level directory.  Most tests are in the directory "test/".  From
+the "test/" directory, run "make <filename>" to run the tests for
+<filename>.el(c).  See "test/README" for more information.
 
 ** Understanding Emacs internals
 
diff --git a/test/README b/test/README
index d2aee9b..2994fca 100644
--- a/test/README
+++ b/test/README
@@ -8,8 +8,7 @@ Emacs uses ERT, Emacs Lisp Regression Testing, for testing.  See (info
 "(ert)") or https://www.gnu.org/software/emacs/manual/html_node/ert/
 for more information on writing and running tests.
 
-All ERT test files are supposed to run from subdirectory automated/.
-The Makefile in that directory supports the following targets:
+The Makefile in this directory supports the following targets:
 
 * make check
   Run all tests as defined in the directory.  Expensive tests are