From: Nik Okuntseff Date: Mon, 18 Jul 2016 17:32:00 +0000 (+0000) Subject: Merge branch 'avidenic-master' X-Git-Tag: timetracker_1.19-1~1702 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/0576ffe7b0fdedf1e38df47d15d2112fb03ec1c6?hp=0afb05f8218082cb068f17a0f16f5bcb5c32131e Merge branch 'avidenic-master' ---