author | Claudius Zingerli <githubmail@zeuz.ch> | |
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200) | ||
committer | Claudius Zingerli <githubmail@zeuz.ch> | |
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200) |
Sync with upstream
Trivial merge
author | Claudius Zingerli <githubmail@zeuz.ch> | |
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200) | ||
committer | Claudius Zingerli <githubmail@zeuz.ch> | |
Fri, 29 Apr 2016 14:29:53 +0000 (16:29 +0200) |