Commit 40d079b3 authored by Laurent Claustre's avatar Laurent Claustre

Merge commit 'bcc8d59d'

Conflicts:
	VERSION
parents 40aaba2d bcc8d59d
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