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)
commitc744753ef5e98040b5311ba774d164f1bbea80f2
treeeed7ba076e107cbee3cc84b867ec17a8e03f2f0d
parentdbf5ee73447b171683311ac47ded81332b1d0286
parent1cccebe54921386c141a560c7f5f604325a72797
Merge remote-tracking branch 'upstream/master'