update changelog, bump version to 2.5.2

3 files changed, 13 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 7e5e87e1..aaa84044 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,11 +8,21 @@ pull request numbers to the requests at
 
 Version 2.5.2
 -------------
-(not released yet)
+(released November 29, 2019)
+
+- Fix incompatibility with some setuptools versions (PR#1316)
 
 - Fix lexing of ReST field lists (PR#1279)
 - Fix lexing of Matlab keywords as field names (PR#1282)
 - Recognize double-quoted strings in Matlab (PR#1278)
+- Avoid slow backtracking in Vim lexer (PR#1312)
+- Fix Scala highlighting of types (PR#1315)
+- Highlight field lists more consistently in ReST (PR#1279)
+- Fix highlighting Matlab keywords in field names (PR#1282)
+- Recognize Matlab double quoted strings (PR#1278)
+- Add some Terraform keywords
+- Update Modelica lexer to 3.4
+- Update Crystal examples
 
 
 Version 2.5.1
diff --git a/pygments/__init__.py b/pygments/__init__.py
index b28da13c..89efc350 100644
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -29,7 +29,7 @@ import sys
 
 from pygments.util import StringIO, BytesIO
 
-__version__ = '2.5.1'
+__version__ = '2.5.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/setup.py b/setup.py
index 8c69b7fb..a973451b 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ from setuptools import setup, find_packages
 
 setup(
     name = 'Pygments',
-    version = '2.5.1',
+    version = '2.5.2',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',