Commit 0e74fb2f authored by Marco De Lucia's avatar Marco De Lucia
Browse files

Merge branch 'master' into 'cran'

# Conflicts:
#   DESCRIPTION
parents 3bf62f22 fd398bb7
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