14 commits

Author	SHA1	Message	Date
ruben-	aaf70d27af	sync with branch01	2016-11-24 20:46:47 +01:00
ruben-	acdde0a28b	Fix 5.4 issues	2016-10-27 00:10:57 +02:00
ruben-	91af385a04	merge with branch01 + php fixes	2016-10-24 20:33:37 +02:00
ruben-	e747de99c8	PHP7 fixes	2016-08-15 20:03:58 +02:00
ruben-	8eb0cbc617	Merge with branch01	2016-06-08 21:47:49 +02:00
ruben-	72ff2827b4	fix php notice	2016-06-06 19:47:12 +02:00
ruben-	c232857821	Merge with branch01	2016-04-27 21:54:28 +02:00
ruben-	34bbc48589	merge with branch1 + new debugging options	2016-03-15 20:54:21 +01:00
ruben-	7f5448790c	Merge with branch1 + version update	2016-03-03 20:28:07 +01:00
ruben-	12ad33e7eb	Sync branch01 + translation fixes	2016-02-15 22:08:39 +01:00
ruben-	e0e6a20693	update version	2016-01-12 20:37:29 +01:00
ruben-	fc6426aacb	fixes after tests	2015-12-06 19:05:27 +01:00
ruben-	f942c94b3d	merge with branch01	2015-12-05 17:38:52 +01:00
Luke Carbis	911adc5bb9	code cleanup	2015-10-15 22:52:37 +10:00