3 commits

Author	SHA1	Message	Date
Robin	1294036a56	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
Robin	0323705513	Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9	2016-05-24 13:15:16 +02:00
Robin	45615275cf	Made the re/undo code from the branch work in this, this is a manual copy as something went horribly wrong with the repository. Before building I first want to check if everything is there.[skip ci]	2016-05-24 12:48:11 +02:00