Michael Vogel 73e98a4814 Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime ... Conflicts: rendertime/rendertime.php		2016-09-15 09:55:58 +00:00
..
lang	updating the addon translations, missed some files due missing git fu	2015-04-03 13:17:32 +02:00
rendertime.php	Merge remote-tracking branch 'upstream/master' into 1609-ignorelist-rendertime	2016-09-15 09:55:58 +00:00