Merge branch 'master' into martin-t/cleanup
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)
commit0015bfa8f1aa78080ded738eb82208b82b1982c0
tree012964cfe3316b7f3eba84463cd0cddadbca3ef5
parent7f40803a2deae3cde63b51b992ded52c89740f82
parent002ea5840a29a6b030124347873667e0128b0b91
Merge branch 'master' into martin-t/cleanup