Glowbal b52c1c8ce3 Merge branch 'master' into fix-c4996
Conflicts:
	extensions/clipboard/ace_clipboard.cpp
2016-06-12 17:35:19 +02:00
..
2016-05-30 18:37:03 +02:00