Commit de9b8cfb authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'master' into 'master_pre_stage'

# Conflicts:
#   Changelog
#   INSTALL.md
#   ISSUES.md
#   README.md
#   RELEASE_NOTES
#   SWITCHING_TO_NEW_INTERFACE.md
#   USERS_GUIDE.md
#   USERS_GUIDE_DEPRECATED_LEGACY_API.md
#   configure.ac
#   elpa.spec
#   test_project_1stage/configure.ac
#   test_project_2stage/configure.ac
#   test_project_C/configure.ac
#   test_project_C_2stage/configure.ac
parents 6cfd4e57 5bff9356
Supports Markdown
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