Commit ec800e42 authored by Adriaan de Groot's avatar Adriaan de Groot

Merge branch 'demmm-master'

FIXES #1354
FIXES #1339

Might be a bit annoying, so there's a TODO to detect yes-i-already-have-
parents 6bef9806 26dd93b6
......@@ -6,6 +6,7 @@ website will have to do for older versions.
# 3.2.21 (unreleased) #
This release contains contributions from (alphabetically by first name):
- Anke Boersma
- Camilo Higuita
- Gabriel Craciunescu
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment