From: Anže Videnič Date: Mon, 4 Jul 2016 13:54:22 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: timetracker_1.19-1~1702^2^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/61d8edb3db70bd197ed6b988727394633b0cecf9?hp=61d8edb3db70bd197ed6b988727394633b0cecf9 Merge remote-tracking branch 'upstream/master' # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. ---