chiark / gitweb /
Merge remote-tracking branch 'upstream/master'
authorRobert Valik <valik@visitors.sk>
Sun, 18 Oct 2015 11:46:58 +0000 (13:46 +0200)
committerRobert Valik <valik@visitors.sk>
Sun, 18 Oct 2015 11:46:58 +0000 (13:46 +0200)

Trivial merge