Commit 49bc4c34 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/Applications/14.12'

Conflicts:
	VERSION
	core/version.h
parents 5275d127 0c4ca94a
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